From dff8c69f2afff6714b893a7c9572a84bd384ff89 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 25 Dec 2024 21:50:09 -0600 Subject: [PATCH 01/18] Basic Soft-Crit Implementation (#1370) # Description This PR adds a simple server configuration option for enabling basic "Soft-Crit", and not much else because oh my god this system is horribly complicated. When enabled, characters can crawl around very slowly while in crit, and really not much else. This more or less mirrors how crit affects character movement in SS13, where you can at least crawl to relative safety while bleeding to death. # Changelog :cl: - add: Added server config options for basic "Soft-Crit". When enabled, characters who are critically injured can still slowly crawl, but are otherwise still helpless and dying. --- Content.Shared/CCVar/CCVars.cs | 23 +++++++++++++++ .../Systems/MobStateSystem.Subscribers.cs | 28 +++++++++++++++++-- .../Systems/SharedMoverController.Input.cs | 7 +++-- .../Movement/Systems/SharedMoverController.cs | 7 +++-- 4 files changed, 58 insertions(+), 7 deletions(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 05a0a7f1883..a02cbb6419f 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -2820,5 +2820,28 @@ public static readonly CVarDef /// public static readonly CVarDef UseDynamicHostname = CVarDef.Create("game.use_dynamic_hostname", false, CVar.SERVERONLY); + + #region SoftCrit + + /// + /// Used for basic Soft-Crit implementation. Entities are allowed to crawl when in crit, as this CVar intercepts the mover controller check for incapacitation, + /// and prevents it from stopping movement if this CVar is set to true and the user is Crit but Not Dead. This is only for movement, + /// you still can't stand up while crit, and you're still more or less helpless. + /// + public static readonly CVarDef AllowMovementWhileCrit = + CVarDef.Create("mobstate.allow_movement_while_crit", true, CVar.REPLICATED); + + public static readonly CVarDef AllowTalkingWhileCrit = + CVarDef.Create("mobstate.allow_talking_while_crit", true, CVar.REPLICATED); + + /// + /// Currently does nothing because I would have to figure out WHERE I would even put this check, and the mover controller is fairly complicated. + /// The goal is to make it so that attempting to move while in 'soft crit' can potentially cause further injury, causing you to die faster. Ideally there would be special + /// actions that can be performed in soft crit, such as applying pressure to your own injuries to slow down the bleedout, or other varieties of "Will To Live". + /// + public static readonly CVarDef DamageWhileCritMove = + CVarDef.Create("mobstate.damage_while_crit_move", false, CVar.REPLICATED); + + #endregion } } diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs index 2088bd4161e..3728813406c 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs @@ -1,5 +1,6 @@ using Content.Shared.Bed.Sleep; using Content.Shared.Buckle.Components; +using Content.Shared.CCVar; using Content.Shared.CombatMode.Pacification; using Content.Shared.Damage.ForceSay; using Content.Shared.Emoting; @@ -16,17 +17,20 @@ using Content.Shared.Standing; using Content.Shared.Strip.Components; using Content.Shared.Throwing; +using Robust.Shared.Configuration; using Robust.Shared.Physics.Components; namespace Content.Shared.Mobs.Systems; public partial class MobStateSystem { + [Dependency] private readonly IConfigurationManager _configurationManager = default!; + //General purpose event subscriptions. If you can avoid it register these events inside their own systems private void SubscribeEvents() { SubscribeLocalEvent(OnGettingStripped); - SubscribeLocalEvent(CheckAct); + SubscribeLocalEvent(OnDirectionAttempt); SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(CheckAct); @@ -38,7 +42,7 @@ private void SubscribeEvents() SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(CheckAct); - SubscribeLocalEvent(CheckAct); + SubscribeLocalEvent(OnMoveAttempt); SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(CheckAct); SubscribeLocalEvent(OnSleepAttempt); @@ -48,6 +52,23 @@ private void SubscribeEvents() SubscribeLocalEvent(OnUnbuckleAttempt); } + private void OnDirectionAttempt(Entity ent, ref ChangeDirectionAttemptEvent args) + { + if (ent.Comp.CurrentState is MobState.Critical && _configurationManager.GetCVar(CCVars.AllowMovementWhileCrit)) + return; + + CheckAct(ent.Owner, ent.Comp, args); + } + + private void OnMoveAttempt(Entity ent, ref UpdateCanMoveEvent args) + { + if (ent.Comp.CurrentState is MobState.Critical && _configurationManager.GetCVar(CCVars.AllowMovementWhileCrit)) + return; + + CheckAct(ent.Owner, ent.Comp, args); + } + + private void OnUnbuckleAttempt(Entity ent, ref UnbuckleAttemptEvent args) { // TODO is this necessary? @@ -145,6 +166,9 @@ private void OnSpeakAttempt(EntityUid uid, MobStateComponent component, SpeakAtt return; } + if (component.CurrentState is MobState.Critical && _configurationManager.GetCVar(CCVars.AllowTalkingWhileCrit)) + return; + CheckAct(uid, component, args); } diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs index 1c097ce17bc..2ea60155570 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs @@ -305,8 +305,11 @@ private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bo if (MoverQuery.TryGetComponent(entity, out var mover)) SetMoveInput(mover, MoveButtons.None); - if (!_mobState.IsIncapacitated(entity)) - HandleDirChange(relayMover.RelayEntity, dir, subTick, state); + if (_mobState.IsDead(entity) + || _mobState.IsCritical(entity) && !_configManager.GetCVar(CCVars.AllowMovementWhileCrit)) + return; + + HandleDirChange(relayMover.RelayEntity, dir, subTick, state); return; } diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 43a63068cf2..46ee949a4e2 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -125,9 +125,10 @@ protected void HandleMobMovement( var canMove = mover.CanMove; if (RelayTargetQuery.TryGetComponent(uid, out var relayTarget)) { - if (_mobState.IsIncapacitated(relayTarget.Source) || - TryComp(relayTarget.Source, out _) || - !MoverQuery.TryGetComponent(relayTarget.Source, out var relayedMover)) + if (_mobState.IsDead(relayTarget.Source) + || TryComp(relayTarget.Source, out _) + || !MoverQuery.TryGetComponent(relayTarget.Source, out var relayedMover) + || _mobState.IsCritical(relayTarget.Source) && !_configManager.GetCVar(CCVars.AllowMovementWhileCrit)) { canMove = false; } From 9430b9046a9a40cc2f96bb3c66251aabbaf9e80a Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Thu, 26 Dec 2024 03:50:37 +0000 Subject: [PATCH 02/18] Automatic Changelog Update (#1370) --- Resources/Changelog/Changelog.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 95604a1e21c..1e832dea293 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8787,3 +8787,13 @@ Entries: id: 6591 time: '2024-12-22T19:57:10.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1334 +- author: VMSolidus + changes: + - type: Add + message: >- + Added server config options for basic "Soft-Crit". When enabled, + characters who are critically injured can still slowly crawl, but are + otherwise still helpless and dying. + id: 6592 + time: '2024-12-26T03:50:10.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1370 From 06b28fbd9ca99c1a73c79afbe686884bbe555a1f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 28 Dec 2024 19:51:30 -0600 Subject: [PATCH 03/18] Another Saltern Update (#1372) # Description This update comes courtesy of the SiN Mapping Team. - Added job roles Courier, Robotics - Did small edits to every department. - Made escape pod area better. - New arrivals dock area. (Including Sec checkpoint) - Fixed multiple bugs - Reworked a lot of medical - Moved Cryogenics. - New station beacons. - Removed ID computers from all command rooms except HOP - All maints space windows buffed.

Media

![image](https://github.com/user-attachments/assets/038eec91-6900-4f33-8e0b-ee4167a8b770) ![image](https://github.com/user-attachments/assets/9670b1ad-4917-4ee5-b99a-a1f819c80f14)

# Changelog :cl: SiN Mapping Team - add: Another big update for Saltern Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> --- Resources/Maps/saltern.yml | 6203 ++++++++++++++++++++---------------- 1 file changed, 3537 insertions(+), 2666 deletions(-) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index e88865dc9b1..36984557dbc 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -65,7 +65,7 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: PAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAWQAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAADdgAAAAABdgAAAAABdgAAAAADdgAAAAABdgAAAAABdgAAAAACPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAWQAAAAABdgAAAAADdgAAAAACdgAAAAAAdgAAAAADdgAAAAADdgAAAAABdgAAAAAAdgAAAAADdgAAAAADdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAAAZAAAAAACZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACAgAAAAAAWQAAAAACWQAAAAACWQAAAAACWQAAAAAAWQAAAAABAgAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAACAgAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAADWQAAAAABWQAAAAAAWQAAAAABAgAAAAAAWQAAAAABWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAACAgAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAADWQAAAAABWQAAAAACWQAAAAADWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAABAgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAABTQAAAAAAWQAAAAABWQAAAAABWQAAAAADeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACYAAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACTQAAAAAAWQAAAAADWQAAAAACWQAAAAACeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAHQAAAAABHQAAAAADHQAAAAACYAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAYAAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAACWQAAAAAAWQAAAAADLQAAAAAAAgAAAAAALQAAAAAAAgAAAAAAWQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAWQAAAAADPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAJgAAAAADJgAAAAACeQAAAAAAWQAAAAAALQAAAAAAAgAAAAAALQAAAAAAAgAAAAAAWQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAJgAAAAABJgAAAAAAJgAAAAADJgAAAAABJgAAAAACeQAAAAAAWQAAAAACAgAAAAAAAgAAAAAAAgAAAAAAWQAAAAABWQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAJgAAAAACJgAAAAABJgAAAAADJgAAAAADUAAAAAAAWQAAAAAALQAAAAAAAgAAAAAALQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: PAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAWQAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAADdgAAAAABdgAAAAABdgAAAAADdgAAAAABdgAAAAABdgAAAAACPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAWQAAAAABdgAAAAADdgAAAAACdgAAAAAAdgAAAAADdgAAAAADdgAAAAABdgAAAAAAdgAAAAADdgAAAAADdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAAAZAAAAAACZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACAgAAAAAAWQAAAAACWQAAAAACWQAAAAACWQAAAAAAWQAAAAABAgAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAACAgAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAADWQAAAAABWQAAAAAAWQAAAAABAgAAAAAAWQAAAAABWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAACAgAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAADWQAAAAABWQAAAAACWQAAAAADWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAABAgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAABTQAAAAAAWQAAAAABWQAAAAABWQAAAAADeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACYAAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACTQAAAAAAWQAAAAADWQAAAAACWQAAAAACeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAHQAAAAABHQAAAAADHQAAAAACYAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAYAAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAACWQAAAAAAWQAAAAADLQAAAAAAAgAAAAAALQAAAAAAAgAAAAAAWQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAWQAAAAADPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAJgAAAAADJgAAAAACeQAAAAAAWQAAAAAALQAAAAAAAgAAAAAALQAAAAAAAgAAAAAAWQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAJgAAAAABJgAAAAAAJgAAAAADJgAAAAAAJgAAAAACeQAAAAAAWQAAAAACAgAAAAAAAgAAAAAAAgAAAAAAWQAAAAABWQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAJgAAAAACJgAAAAABJgAAAAADJgAAAAADUAAAAAAAWQAAAAAALQAAAAAAAgAAAAAALQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 0,-1: ind: 0,-1 @@ -85,11 +85,11 @@ entities: version: 6 -2,0: ind: -2,0 - tiles: eQAAAAAAdgAAAAADdgAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAKAAAAAAAYAAAAAAABgAAAAAAYAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAYAAAAAAAKAAAAAAAYAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAABWQAAAAABWQAAAAABWQAAAAACWQAAAAABAgAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAACWQAAAAACWQAAAAACAgAAAAADWQAAAAADTQAAAAAAWQAAAAAAAgAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACAgAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAACAgAAAAAAWQAAAAABeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAACWQAAAAABWQAAAAADWQAAAAABWQAAAAAAWwAAAAADWwAAAAADeQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAACeQAAAAAAAgAAAAAAWQAAAAACWwAAAAABWwAAAAACeQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAABAgAAAAAAWQAAAAADWQAAAAADWQAAAAADWQAAAAABWwAAAAADWwAAAAABeQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAADeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAJgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAA + tiles: eQAAAAAAdgAAAAADdgAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAKAAAAAAAYAAAAAAABgAAAAAAYAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAYAAAAAAAKAAAAAAAYAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAABWQAAAAABWQAAAAABWQAAAAACWQAAAAABAgAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAACWQAAAAACWQAAAAACAgAAAAADWQAAAAADTQAAAAAAWQAAAAAAAgAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACAgAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAACAgAAAAAAWQAAAAABeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAACWQAAAAABWQAAAAADWQAAAAABWQAAAAAAWwAAAAADWwAAAAADeQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAACeQAAAAAAAgAAAAAAWQAAAAACWwAAAAABWwAAAAACeQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAABAgAAAAAAWQAAAAADWQAAAAADWQAAAAADWQAAAAABWwAAAAADWwAAAAABeQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAADeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAJgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAA version: 6 1,-1: ind: 1,-1 - tiles: eQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAcQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAADbAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAADbAAAAAADbAAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAADBQAAAAAAbAAAAAACcQAAAAADdgAAAAACdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAADbAAAAAACbAAAAAABbAAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAABdgAAAAACdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAbAAAAAAAbAAAAAACbAAAAAAAbAAAAAADeQAAAAAAdgAAAAABdgAAAAAAdgAAAAAAdgAAAAABdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAbAAAAAABbAAAAAADbAAAAAABbAAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAABBQAAAAAAbAAAAAABbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAACbAAAAAACbAAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAABbAAAAAABbAAAAAADbAAAAAACcQAAAAACbAAAAAABbAAAAAAAbAAAAAABbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAbAAAAAABbAAAAAADbAAAAAADbAAAAAACeQAAAAAAbAAAAAACbAAAAAADbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAADbAAAAAADbAAAAAAAbAAAAAACeQAAAAAAbAAAAAACbAAAAAABbAAAAAACbAAAAAACeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAABbAAAAAACbAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAADAgAAAAAAWQAAAAADbAAAAAABbAAAAAACbAAAAAABbAAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAADbAAAAAADbAAAAAACbAAAAAABbAAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAADbAAAAAABbAAAAAAAbAAAAAABbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAB + tiles: eQAAAAAABQAAAAAAbAAAAAAAbAAAAAAABQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAcQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAADbAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAADbAAAAAADbAAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAADBQAAAAAAbAAAAAACcQAAAAADdgAAAAACdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAADbAAAAAACbAAAAAABbAAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAABdgAAAAACdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAbAAAAAAAbAAAAAACbAAAAAAAbAAAAAADeQAAAAAAdgAAAAABdgAAAAAAdgAAAAAAdgAAAAABdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAbAAAAAABbAAAAAADbAAAAAABbAAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAABBQAAAAAAbAAAAAABbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAACbAAAAAACbAAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAABbAAAAAABbAAAAAADbAAAAAACcQAAAAACbAAAAAABbAAAAAAAbAAAAAABbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAbAAAAAABbAAAAAADbAAAAAADbAAAAAACeQAAAAAAbAAAAAACbAAAAAADbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAADbAAAAAADbAAAAAAAbAAAAAACeQAAAAAAbAAAAAACbAAAAAABbAAAAAACbAAAAAACeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAABbAAAAAACbAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAADAgAAAAAAWQAAAAADbAAAAAABbAAAAAACbAAAAAABbAAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAADbAAAAAADbAAAAAACbAAAAAABbAAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAADbAAAAAABbAAAAAAAbAAAAAABbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAB version: 6 0,-2: ind: 0,-2 @@ -97,15 +97,15 @@ entities: version: 6 1,-2: ind: 1,-2 - tiles: eQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAYAAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAABYAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAcQAAAAACcQAAAAABcQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAbAAAAAAABQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAABQAAAAAAbAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -1,1: ind: -1,1 - tiles: eQAAAAAAJgAAAAABJgAAAAABJgAAAAABeQAAAAAAeQAAAAAAWQAAAAACAgAAAAAAAgAAAAAAAgAAAAAAWQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAADeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAADeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAIgAAAAAAdgAAAAADdgAAAAACdgAAAAACeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAABdgAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATQAAAAAAHQAAAAAAHQAAAAACHQAAAAADeQAAAAAAHQAAAAACHQAAAAABHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAATQAAAAAAHQAAAAABHQAAAAACHQAAAAADHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAADeQAAAAAAHQAAAAACeQAAAAAAHQAAAAAA + tiles: eQAAAAAAJgAAAAABJgAAAAABJgAAAAABeQAAAAAAeQAAAAAAWQAAAAACAgAAAAAAAgAAAAAAAgAAAAAAWQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAADeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAADeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAIgAAAAAAdgAAAAADdgAAAAACdgAAAAACeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAABdgAAAAACeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATQAAAAAAHQAAAAAAHQAAAAACHQAAAAADeQAAAAAAHQAAAAACHQAAAAABHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAATQAAAAAAHQAAAAABHQAAAAACHQAAAAADHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAHQAAAAABHQAAAAADHQAAAAADHQAAAAADeQAAAAAAHQAAAAACeQAAAAAAHQAAAAAA version: 6 -2,1: ind: -2,1 - tiles: dgAAAAAAeQAAAAAAKQAAAAAAKQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAdgAAAAABeQAAAAAAKQAAAAAAKQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAALgAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WQAAAAAAWQAAAAAAAgAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAgAAAAAAWQAAAAAAWQAAAAAAAgAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAAgAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAAgAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAALAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAALAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAALgAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAALAAAAAAALAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAALAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,2: ind: -1,2 @@ -113,7 +113,7 @@ entities: version: 6 1,1: ind: 1,1 - tiles: aAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAADWQAAAAACWQAAAAACWQAAAAAAZAAAAAACWQAAAAABWQAAAAAAWQAAAAADZAAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAACZAAAAAADWQAAAAACWQAAAAABWQAAAAAAZAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADeQAAAAAAZAAAAAABaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAADeQAAAAAAZAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAZAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: aAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAADWQAAAAACWQAAAAACWQAAAAAAZAAAAAACWQAAAAABWQAAAAAAWQAAAAADZAAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAACZAAAAAADWQAAAAACWQAAAAABWQAAAAAAZAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADeQAAAAAAZAAAAAABaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAADeQAAAAAAZAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAZAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,2: ind: 0,2 @@ -129,7 +129,7 @@ entities: version: 6 2,-1: ind: 2,-1 - tiles: AAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAACEwAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEwAAAAACdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABEwAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAEwAAAAAEeQAAAAAAEwAAAAADdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAACAgAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAADeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAACdgAAAAADeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAdgAAAAAAdgAAAAABdgAAAAADdgAAAAACdgAAAAABeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAA + tiles: AAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAACEwAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEwAAAAACdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABEwAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAEwAAAAAEeQAAAAAAEwAAAAADdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAACAgAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAADeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAACdgAAAAADeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAdgAAAAAAdgAAAAABdgAAAAADdgAAAAACdgAAAAABeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAA version: 6 -1,-2: ind: -1,-2 @@ -137,7 +137,7 @@ entities: version: 6 -2,-2: ind: -2,-2 - tiles: HQAAAAAAHQAAAAADeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAABdgAAAAACdgAAAAADdgAAAAACdgAAAAABdgAAAAAAdgAAAAABRQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAABdgAAAAAAdgAAAAAAdgAAAAADeQAAAAAAdgAAAAACdgAAAAADeQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADdgAAAAABdgAAAAADeQAAAAAAHQAAAAAAHQAAAAADdgAAAAAAdgAAAAABdgAAAAABdgAAAAACeQAAAAAAdgAAAAABdgAAAAAAdgAAAAADdgAAAAACdgAAAAACdgAAAAACdgAAAAABdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAACeQAAAAAAdgAAAAACdgAAAAAAdgAAAAADdgAAAAAAdgAAAAADdgAAAAABdgAAAAADdgAAAAAAeQAAAAAAIQAAAAACIQAAAAADdgAAAAADdgAAAAADdgAAAAAAdgAAAAABdgAAAAAAdgAAAAACdgAAAAAAdgAAAAADdgAAAAACdgAAAAACdgAAAAABdgAAAAABdgAAAAACHQAAAAAAIQAAAAADIQAAAAAAdgAAAAAAdgAAAAADdgAAAAADdgAAAAACdgAAAAABdgAAAAADdgAAAAABdgAAAAABdgAAAAACdgAAAAABdgAAAAABdgAAAAADdgAAAAACHQAAAAADIQAAAAABIQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAACdgAAAAADdgAAAAACdgAAAAADdgAAAAABdgAAAAACeQAAAAAAIQAAAAADIQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAABdgAAAAACdgAAAAACdgAAAAAAdgAAAAADdgAAAAACdgAAAAABeQAAAAAAIQAAAAAAIQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAADdgAAAAADdgAAAAABdgAAAAABdgAAAAAAdgAAAAABdgAAAAADeQAAAAAAeQAAAAAAIQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAABWQAAAAABWQAAAAABAgAAAAAAWQAAAAAB + tiles: HQAAAAAAHQAAAAADeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAABdgAAAAACdgAAAAADdgAAAAACdgAAAAABdgAAAAAAdgAAAAABRQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAABdgAAAAAAdgAAAAAAdgAAAAADeQAAAAAAdgAAAAACdgAAAAADeQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADdgAAAAABdgAAAAADeQAAAAAAHQAAAAAAHQAAAAADdgAAAAAAdgAAAAABdgAAAAABdgAAAAACeQAAAAAAdgAAAAABdgAAAAAAdgAAAAADdgAAAAACdgAAAAACdgAAAAACdgAAAAABdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAACeQAAAAAAdgAAAAACdgAAAAAAdgAAAAADdgAAAAAAdgAAAAADdgAAAAABdgAAAAADdgAAAAAAeQAAAAAAIQAAAAACIQAAAAADdgAAAAADdgAAAAADdgAAAAAAdgAAAAABdgAAAAAAdgAAAAACdgAAAAAAdgAAAAADdgAAAAACdgAAAAACdgAAAAABdgAAAAABdgAAAAACHQAAAAAAIQAAAAADIQAAAAAAdgAAAAAAdgAAAAADdgAAAAADdgAAAAACdgAAAAABdgAAAAADdgAAAAABdgAAAAABdgAAAAACdgAAAAABdgAAAAABdgAAAAADdgAAAAACHQAAAAADIQAAAAABIQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAACdgAAAAADdgAAAAACdgAAAAADdgAAAAABdgAAAAACeQAAAAAAIQAAAAADIQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAABdgAAAAACdgAAAAACdgAAAAAAdgAAAAADdgAAAAACdgAAAAABeQAAAAAAIQAAAAAAIQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAADdgAAAAADdgAAAAABdgAAAAABdgAAAAAAdgAAAAABdgAAAAADeQAAAAAAeQAAAAAAIQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAABWQAAAAABWQAAAAABAgAAAAAAWQAAAAAB version: 6 -2,-1: ind: -2,-1 @@ -145,19 +145,19 @@ entities: version: 6 -3,0: ind: -3,0 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABAgAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAACeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAACWQAAAAADWQAAAAADWQAAAAABWQAAAAABWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAACWQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAABWQAAAAAAAgAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAdgAAAAABEwAAAAABEwAAAAACEwAAAAAEdgAAAAABeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAEwAAAAADdgAAAAAAdgAAAAAAEwAAAAACEwAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAdgAAAAACdgAAAAABEwAAAAAAEwAAAAAAEwAAAAABdgAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAEwAAAAABdgAAAAACEwAAAAADdgAAAAAAEwAAAAAEeQAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABAgAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAACeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAACWQAAAAADWQAAAAADWQAAAAABWQAAAAABWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAACWQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAABWQAAAAAAAgAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAAgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAdgAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAA version: 6 -3,-1: ind: -3,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAABWQAAAAACWQAAAAACWQAAAAADWQAAAAAAWQAAAAAAWQAAAAACWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAALQAAAAADLQAAAAAAWQAAAAADWQAAAAADWQAAAAAALQAAAAACLQAAAAACLQAAAAACWQAAAAADAgAAAAAALQAAAAAALQAAAAACLQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAAgAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAABZAAAAAAAZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAAgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAALAAAAAAALAAAAAAALAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAABAgAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAABAgAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAA version: 6 3,-1: ind: 3,-1 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAAAeQAAAAAAJgAAAAADJgAAAAACaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAJgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJgAAAAABeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAHQAAAAABHQAAAAABeQAAAAAAJgAAAAABJgAAAAABeQAAAAAAQAAAAAAAeQAAAAAAaAAAAAAAQAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJgAAAAADeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAHQAAAAAAHQAAAAABeQAAAAAAJgAAAAABJgAAAAADeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAJgAAAAACeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAWQAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAADWQAAAAACWQAAAAABeQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAABZAAAAAACWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAABWQAAAAABWQAAAAABWQAAAAABeQAAAAAAaAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAWQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAAAeQAAAAAAJgAAAAADJgAAAAACaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAJgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJgAAAAABeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAHQAAAAABHQAAAAABeQAAAAAAJgAAAAABJgAAAAABeQAAAAAAQAAAAAAAeQAAAAAAaAAAAAAAQAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJgAAAAADeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAHQAAAAAAHQAAAAABeQAAAAAAJgAAAAABJgAAAAADeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAJgAAAAACeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAZAAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAWQAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAADWQAAAAACWQAAAAABeQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAABWQAAAAABWQAAAAACWQAAAAABZAAAAAACWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAABWQAAAAABWQAAAAABWQAAAAABeQAAAAAAaAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAZAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAWQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 2,-2: ind: 2,-2 - tiles: eAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACJgAAAAAALQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABLQAAAAABHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALQAAAAADHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALQAAAAACJgAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALQAAAAABHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACLQAAAAACHQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADJgAAAAAALQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAA + tiles: eAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACJgAAAAAALQAAAAABAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABLQAAAAABHQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALQAAAAADHQAAAAAAHQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALQAAAAACJgAAAAAAHQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALQAAAAABHQAAAAAAHQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACLQAAAAACHQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADJgAAAAAALQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAA version: 6 5,-1: ind: 5,-1 @@ -173,11 +173,11 @@ entities: version: 6 -3,1: ind: -3,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAEwAAAAADeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAdgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAdgAAAAACEwAAAAACdgAAAAAAdgAAAAACdgAAAAADdgAAAAACdgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAdgAAAAACdgAAAAAAdgAAAAACdgAAAAABdgAAAAACdgAAAAABdgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAdgAAAAABEwAAAAACdgAAAAABEwAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAgAAAAAAWQAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAJgAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAgAAAAAAWQAAAAAAJgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAAgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAAgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAgAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAA version: 6 0,-3: ind: 0,-3 - tiles: eAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAKAAAAAADKAAAAAACeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAADHQAAAAACHQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJAAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAACdgAAAAAAdgAAAAACdgAAAAABdgAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAADdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: eAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAKAAAAAADKAAAAAACeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAADHQAAAAACHQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJAAAAAABJAAAAAABJAAAAAACJAAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJAAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAACdgAAAAAAdgAAAAACdgAAAAABdgAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAADdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 1,-3: ind: 1,-3 @@ -193,7 +193,7 @@ entities: version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAKAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAWQAAAAABOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAADOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAACdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAABdgAAAAAAdgAAAAACeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAADdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAKAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAWQAAAAABOgAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAADOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAACdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAABdgAAAAAAdgAAAAACeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAADdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 4,-1: ind: 4,-1 @@ -221,7 +221,7 @@ entities: version: 6 -2,-3: ind: -2,-3 - tiles: eAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAADeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAA + tiles: eAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAdgAAAAADeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeAAAAAAA version: 6 -4,0: ind: -4,0 @@ -229,7 +229,7 @@ entities: version: 6 -4,-1: ind: -4,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAABWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACLQAAAAACLQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -3,2: ind: -3,2 @@ -237,7 +237,7 @@ entities: version: 6 -2,2: ind: -2,2 - tiles: TAAAAAADTAAAAAADTAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAABTAAAAAADTAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAACTAAAAAADTAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAACTAAAAAACTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAADTAAAAAADTAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAADTAAAAAABTAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: TAAAAAADTAAAAAADTAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAABTAAAAAADTAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAACTAAAAAADTAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAACTAAAAAACTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAADTAAAAAADTAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAADTAAAAAABTAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -4,-2: ind: -4,-2 @@ -469,7 +469,7 @@ entities: 0: 53709 4,4: 0: 4573 - 2: 16384 + 3: 16384 5,0: 0: 62190 5,1: @@ -499,7 +499,8 @@ entities: 7,2: 0: 35771 7,3: - 0: 40159 + 0: 39135 + 2: 1024 7,4: 0: 55739 7,-1: @@ -532,27 +533,27 @@ entities: 0: 3581 1,7: 0: 4369 - 2: 17484 + 3: 17484 1,8: 0: 4369 - 2: 17476 + 3: 17476 2,5: 0: 53367 2,6: 0: 1405 2,7: - 2: 7 + 3: 7 3,5: 0: 4210 - 2: 32768 + 3: 32768 3,6: 0: 13073 - 2: 8 + 3: 8 3,7: - 2: 4 + 3: 4 4,5: 0: 273 - 2: 29764 + 3: 29764 -8,0: 0: 61550 -9,0: @@ -564,14 +565,13 @@ entities: -8,2: 0: 56796 -9,2: - 0: 35835 + 0: 39931 -8,3: 0: 4081 -9,3: 0: 16315 -8,4: - 0: 477 - 2: 49152 + 0: 65535 -8,-1: 0: 26208 -7,0: @@ -581,11 +581,11 @@ entities: -7,2: 0: 49087 -7,3: - 0: 53240 + 0: 61432 -7,-1: 0: 65407 -7,4: - 0: 61039 + 0: 61054 -6,0: 0: 61678 -6,1: @@ -601,7 +601,7 @@ entities: -5,4: 0: 30310 4,-5: - 0: 61152 + 0: 61156 5,-4: 0: 3777 5,-3: @@ -623,7 +623,7 @@ entities: 7,-2: 0: 57599 7,-4: - 2: 8738 + 3: 8738 7,-3: 0: 3808 8,-3: @@ -644,7 +644,7 @@ entities: 0: 65524 0,-9: 0: 52416 - 2: 273 + 3: 273 1,-8: 0: 65488 1,-7: @@ -661,7 +661,7 @@ entities: 0: 61695 2,-9: 0: 13107 - 2: 128 + 3: 2176 3,-8: 0: 52637 3,-7: @@ -670,77 +670,76 @@ entities: 0: 64733 4,-8: 0: 4483 - 2: 17484 + 3: 17484 4,-7: 0: 65281 - 2: 12 + 3: 12 4,-6: 0: 61152 4,-9: - 2: 16384 + 3: 16384 0: 32768 5,-8: - 2: 21855 + 3: 21855 0: 160 5,-7: - 2: 15 + 3: 15 0: 63232 5,-9: - 2: 20480 + 3: 20480 0: 40960 5,-6: 0: 26214 6,-8: - 2: 21855 + 3: 21855 0: 160 6,-7: - 2: 15 + 3: 15 0: 56576 6,-6: 0: 61919 6,-9: - 2: 20480 + 3: 20480 0: 40960 7,-8: - 2: 21855 + 3: 21855 0: 160 7,-7: - 2: 8751 + 3: 11823 7,-5: 0: 36846 7,-9: - 2: 20767 + 3: 20767 0: 40960 7,-6: - 2: 3618 + 3: 546 + 0: 32768 8,-8: - 2: 21855 + 3: 21855 0: 160 8,-7: - 2: 15 - 8,-6: - 2: 3840 + 3: 9007 8,-5: - 0: 4016 + 0: 4017 -4,5: 0: 238 -4,6: 0: 255 - 2: 61440 + 3: 61440 -5,5: 0: 58982 -5,6: 0: 238 - 2: 61440 + 3: 61440 -3,5: 0: 3295 -3,6: 0: 255 - 2: 61440 + 3: 61440 -3,7: - 2: 51406 + 3: 51406 -3,8: - 2: 14 + 3: 14 0: 52224 -2,5: 0: 52701 @@ -750,52 +749,51 @@ entities: 0: 61166 -1,8: 0: 34952 - 2: 13104 + 3: 13104 -9,4: - 0: 7400 + 0: 65471 -8,5: - 2: 8879 - 0: 21840 + 0: 13072 + 3: 128 -9,5: - 2: 43692 - 0: 21840 + 0: 65459 -8,6: - 2: 41519 - 0: 21840 + 0: 1 + 3: 63304 -9,6: - 2: 43695 - 0: 21840 + 0: 59 + 3: 63488 -8,7: - 2: 2039 + 3: 2039 -9,7: - 2: 28671 + 3: 28671 -7,6: - 2: 63249 + 3: 63249 0: 14 -7,7: - 2: 16 + 3: 16 -7,5: 0: 1038 - 2: 4352 + 3: 4352 -6,5: 0: 65327 -6,6: 0: 255 - 2: 61440 + 3: 61440 -3,9: 0: 12 - 2: 3584 + 3: 3584 -2,8: 0: 30560 -2,9: 0: 7 - 2: 3840 + 3: 3840 -1,9: - 2: 405 + 3: 405 0,9: - 2: 240 + 3: 240 4,6: - 2: 550 + 3: 550 0: 34816 5,5: 0: 30583 @@ -805,24 +803,24 @@ entities: 0: 5 6,5: 0: 255 - 2: 53248 + 3: 61440 6,6: - 2: 35561 + 3: 35561 7,5: 0: 36063 - 2: 4096 + 3: 4096 7,6: - 2: 53196 + 3: 53196 8,4: 0: 4351 - 2: 57344 + 3: 57344 8,5: 0: 272 - 4: 17472 + 5: 17472 8,6: - 2: 4081 + 3: 4081 1,9: - 2: 18 + 3: 18 9,0: 0: 65102 9,1: @@ -833,7 +831,7 @@ entities: 0: 65535 9,4: 0: 255 - 2: 61440 + 3: 61440 9,-1: 0: 60942 10,0: @@ -848,52 +846,52 @@ entities: 0: 48015 10,4: 0: 255 - 2: 61440 + 3: 61440 11,0: 0: 65520 11,1: 0: 53759 11,2: 0: 4319 - 3: 49152 + 4: 49152 11,3: 0: 61457 - 3: 204 + 4: 204 11,-1: 0: 30583 11,4: 0: 255 - 2: 61440 + 3: 61440 12,0: 0: 65527 12,1: 0: 28791 12,2: 0: 119 - 3: 28672 + 4: 28672 12,3: - 3: 119 + 4: 119 0: 61440 12,-1: 0: 29311 12,4: 0: 255 - 2: 61440 + 3: 61440 13,0: 0: 49080 13,1: 0: 48058 13,2: - 2: 13104 + 3: 13104 0: 34826 13,3: - 2: 35059 + 3: 35059 0: 12288 13,-1: 0: 14119 13,4: 0: 51 - 2: 63624 + 3: 63624 14,0: 0: 48123 14,1: @@ -901,9 +899,9 @@ entities: 14,2: 0: 15235 14,3: - 2: 65528 + 3: 65528 14,4: - 2: 62455 + 3: 62455 15,0: 0: 56797 15,1: @@ -911,23 +909,23 @@ entities: 15,2: 0: 3548 15,3: - 2: 32767 + 3: 32767 15,4: - 2: 12850 + 3: 12850 15,-1: 0: 52701 16,0: 0: 13116 - 3: 52416 + 4: 52416 16,1: 0: 65484 16,2: - 2: 15 + 3: 15 0: 4080 16,3: - 2: 20479 + 3: 20479 8,-4: - 2: 8738 + 3: 8738 0: 34952 9,-4: 0: 56789 @@ -936,29 +934,29 @@ entities: 9,-2: 0: 58999 9,-5: - 0: 18288 + 0: 18295 10,-4: 0: 65024 - 2: 8 + 3: 14 10,-3: 0: 65520 10,-2: 0: 63743 10,-5: - 2: 34956 + 3: 34956 11,-4: + 3: 2187 0: 13056 - 2: 2184 11,-3: 0: 43946 11,-2: 0: 30250 11,-5: 0: 32776 - 2: 17968 + 3: 17968 12,-4: 0: 7 - 2: 1272 + 3: 4088 12,-3: 0: 65535 12,-2: @@ -966,7 +964,7 @@ entities: -4,-8: 0: 4016 -4,-9: - 2: 28672 + 3: 28672 0: 127 -5,-8: 0: 2995 @@ -996,15 +994,15 @@ entities: 0: 57309 -2,-9: 0: 61440 - 2: 47 + 3: 47 -1,-6: 0: 30065 -8,-8: - 0: 35331 - 2: 8 + 0: 60931 + 3: 8 -8,-9: 0: 12288 - 2: 35064 + 3: 35064 -9,-8: 0: 56653 -8,-7: @@ -1015,16 +1013,16 @@ entities: 0: 36863 -9,-6: 0: 3211 - 2: 12288 + 3: 12288 -8,-5: 0: 48123 -9,-5: 0: 43008 - 2: 4 + 3: 4 -8,-4: 0: 35771 -7,-8: - 2: 7 + 3: 7 0: 7936 -7,-6: 0: 61428 @@ -1035,7 +1033,7 @@ entities: -7,-4: 0: 36317 -7,-9: - 2: 17408 + 3: 17408 0: 32768 -6,-8: 0: 36747 @@ -1045,27 +1043,30 @@ entities: 0: 62463 -6,-9: 0: 61440 - 2: 34 + 3: 34 -6,-7: 0: 52878 -6,-4: 0: 62463 -5,-9: 0: 12799 - 2: 32768 + 3: 32768 -9,-4: 0: 34952 - 2: 800 + 3: 800 -8,-3: 0: 3663 -9,-3: - 0: 56797 + 0: 52428 + 3: 4369 -8,-2: 0: 59119 -9,-2: - 0: 57309 + 0: 52428 + 3: 4369 -9,-1: - 0: 56781 + 0: 56780 + 3: 1 -7,-2: 0: 65262 -7,-3: @@ -1085,120 +1086,108 @@ entities: -11,0: 0: 3855 -12,1: - 2: 2056 + 3: 2056 -11,2: 0: 3855 - -12,3: - 2: 136 -11,1: - 2: 546 + 3: 546 0: 2184 - -11,3: - 2: 58030 - -11,4: - 2: 70 -10,0: 0: 65535 -10,1: 0: 65535 -10,2: - 0: 4095 + 0: 53247 + -11,3: + 3: 34952 -10,3: 0: 61166 -10,-1: - 0: 61134 - -12,-3: - 0: 4095 - -13,-3: - 0: 4095 - -12,-4: - 0: 32768 - -11,-3: - 0: 4095 - -12,-2: - 2: 136 - -11,-2: - 2: 15 0: 60928 + 3: 15 + -10,4: + 0: 61182 -12,-1: - 2: 2184 + 3: 2738 -11,-1: - 0: 14 - 2: 3584 - -10,-3: - 0: 53247 + 3: 3628 + -11,-2: + 3: 32768 -10,-2: - 2: 1 - 0: 65228 + 3: 4492 + -10,-3: + 3: 57480 -10,-4: - 2: 3720 + 3: 136 -10,-5: - 2: 32776 + 3: 32776 12,-5: 0: 62079 13,-4: - 2: 2808 + 3: 3064 13,-3: 0: 48059 13,-2: 0: 63243 13,-5: - 2: 39912 + 3: 39912 14,-4: - 2: 1039 + 3: 1039 14,-3: 0: 13107 - 2: 128 + 3: 128 14,-2: 0: 65283 14,-1: 0: 4095 14,-5: - 2: 17600 + 3: 17600 15,-4: - 2: 8739 + 3: 8739 15,-3: - 2: 62066 + 3: 62066 15,-2: 0: 7424 - 2: 206 + 3: 206 15,-5: - 2: 8721 + 3: 8721 16,-3: - 2: 61440 + 3: 61440 16,-2: - 2: 255 + 3: 255 0: 3840 16,-1: 0: 53247 8,-9: - 2: 24143 + 3: 24143 0: 41120 + 8,-6: + 3: 3618 9,-8: - 2: 15 + 3: 15 9,-7: - 2: 15 + 3: 15 9,-6: - 2: 3840 + 3: 3840 10,-8: - 2: 55703 + 3: 55703 10,-7: - 2: 8743 + 3: 8743 0: 34816 10,-6: - 2: 50978 + 3: 50978 0: 8 10,-9: - 2: 40847 + 3: 40847 11,-8: - 2: 54 + 3: 54 0: 2048 11,-7: 0: 64988 11,-6: 0: 3293 11,-9: - 2: 49921 + 3: 49921 12,-8: 0: 12144 12,-7: @@ -1206,77 +1195,78 @@ entities: 12,-6: 0: 24568 20,-1: - 2: 256 + 3: 256 19,-1: - 2: 65335 + 3: 65335 20,0: - 2: 16179 + 3: 16179 19,0: - 2: 39118 + 3: 39118 0: 17441 20,1: - 2: 14135 + 3: 14135 19,1: - 2: 39321 + 3: 39321 0: 17476 20,2: - 2: 29495 + 3: 29495 19,2: - 2: 53179 + 3: 53179 0: 8260 20,3: - 2: 35 + 3: 35 19,3: - 2: 4095 + 3: 4095 12,-9: - 2: 61440 + 3: 61440 13,-8: - 2: 35043 + 3: 35043 13,-7: 0: 64849 13,-6: 0: 349 - 2: 32768 + 3: 32768 13,-9: - 2: 4096 + 3: 4096 14,-8: - 2: 6144 + 3: 6144 14,-7: - 2: 8739 + 3: 8739 14,-6: - 2: 4898 + 3: 4898 15,-8: - 2: 4352 + 3: 4352 15,-7: - 2: 4369 + 3: 4369 15,-6: - 2: 4369 - -11,5: - 2: 35916 - -11,7: - 2: 35840 - -10,5: - 2: 39296 - 0: 17488 + 3: 4369 + -11,4: + 0: 192 + 3: 32768 -11,6: - 2: 2184 + 0: 12 + 3: 34816 + -11,7: + 3: 35840 + -11,5: + 3: 2184 -10,6: - 0: 21569 - 2: 35230 + 0: 4335 + 3: 57344 -10,7: - 2: 4040 + 3: 4040 -11,8: - 2: 34952 - -10,4: - 0: 61152 + 3: 34952 + -10,5: + 0: 61166 -9,8: 0: 2827 - 2: 25844 + 3: 25844 0,-12: - 2: 79 + 3: 127 0: 12288 -1,-12: - 2: 79 + 3: 975 0: 32768 0,-11: 0: 29107 @@ -1284,14 +1274,14 @@ entities: 0: 2047 0,-10: 0: 247 - 2: 57344 + 3: 57344 -1,-10: 0: 255 - 2: 36864 + 3: 36864 -1,-9: - 2: 3257 + 3: 3257 1,-12: - 2: 4375 + 3: 4375 1,-11: 0: 3536 1,-10: @@ -1301,250 +1291,254 @@ entities: 2,-10: 0: 14196 2,-12: - 2: 44800 + 3: 44800 3,-12: - 2: 768 + 3: 768 3,-10: - 2: 18240 + 3: 18240 3,-9: - 2: 1396 + 3: 1908 7,-12: - 2: 7455 + 3: 7455 7,-11: - 2: 7453 + 3: 7453 7,-10: - 2: 4381 + 3: 4381 8,-12: - 2: 20303 + 3: 20303 8,-11: - 2: 20303 + 3: 20303 8,-10: - 2: 20047 + 3: 20047 0: 40960 9,5: - 5: 4368 - 3: 17472 + 6: 4368 + 4: 17472 9,6: - 2: 12272 + 3: 12272 10,5: - 3: 4368 - 6: 17472 + 4: 4368 + 7: 17472 10,6: - 2: 4080 + 3: 4080 11,5: - 3: 21840 + 4: 21840 11,6: - 2: 61424 + 3: 61424 11,7: - 2: 12 + 3: 12 12,5: - 2: 65535 + 3: 65535 12,6: - 2: 65535 + 3: 65535 12,7: - 2: 15 + 3: 15 13,5: - 2: 55705 + 3: 55705 13,6: - 2: 16383 + 3: 16383 13,7: - 2: 1 + 3: 1 14,5: - 2: 30591 + 3: 30591 14,6: - 2: 7 + 3: 7 15,5: - 2: 35 + 3: 35 + -4,-11: + 3: 3840 + -5,-11: + 3: 11776 -4,-10: 0: 6143 -5,-10: 0: 14472 - 2: 2 - -3,-10: - 0: 29949 + 3: 2 -3,-11: - 2: 304 + 3: 304 0: 34944 + -3,-10: + 0: 29949 -2,-10: 0: 1019 -2,-11: - 2: 544 + 3: 544 0: 2176 + -2,-12: + 3: 2048 17,-3: - 2: 61696 + 3: 61696 17,-2: - 2: 3327 + 3: 3327 0: 768 17,-1: 0: 4369 - 2: 52428 + 3: 52428 17,0: 0: 19969 - 2: 8 - 3: 4368 + 3: 8 + 4: 4368 18,-3: - 2: 4096 + 3: 4096 18,-2: - 2: 59381 + 3: 59381 18,-1: - 2: 15358 + 3: 15358 0: 33792 18,0: - 2: 65399 + 3: 65399 19,-2: - 2: 12288 + 3: 12288 17,1: 0: 65365 17,2: 0: 4095 17,3: - 2: 16383 + 3: 16383 18,1: - 2: 61167 + 3: 61167 18,2: 0: 1792 - 2: 2190 + 3: 2190 18,3: - 2: 40959 + 3: 40959 12,-10: - 2: 61440 + 3: 61440 11,-10: - 2: 61440 + 3: 61440 13,-10: - 2: 7936 + 3: 7936 14,-10: - 2: 256 + 3: 256 9,-12: - 2: 1807 + 3: 1807 9,-11: - 2: 1799 + 3: 1799 9,-10: - 2: 7 + 3: 7 9,-9: - 2: 3855 + 3: 3855 10,-12: - 2: 4369 + 3: 4369 10,-11: - 2: 4369 + 3: 4369 10,-10: - 2: 4369 + 3: 4369 -12,-8: - 2: 64170 + 3: 64170 -13,-8: - 2: 64170 + 3: 64170 -12,-7: - 2: 64170 + 3: 64170 -13,-7: - 2: 64170 + 3: 64170 -12,-9: - 2: 61440 + 3: 61440 -11,-8: - 2: 64170 + 3: 64170 -11,-7: - 2: 64170 + 3: 64170 -11,-9: - 2: 61440 + 3: 61440 -10,-8: - 2: 12834 + 3: 12834 0: 34828 -10,-7: - 2: 12834 + 3: 12834 0: 34952 -10,-9: - 2: 13288 + 3: 13288 0: 32768 -10,-6: - 2: 57378 + 3: 57378 0: 8 -9,-9: 0: 61440 - 2: 248 + 3: 248 -13,-9: - 2: 61440 + 3: 61440 -11,-10: - 2: 8 + 3: 8 -10,-10: - 2: 63631 + 3: 63631 -10,-12: - 2: 59592 + 3: 59592 -9,-12: - 2: 63743 + 3: 63743 -10,-11: - 2: 34952 + 3: 34952 -9,-11: - 2: 63736 + 3: 63736 -9,-10: - 2: 63736 + 3: 63736 -9,-13: - 2: 61440 + 3: 61440 -8,-12: - 2: 63743 + 3: 63743 -8,-11: - 2: 63736 + 3: 63736 -8,-10: - 2: 63736 + 3: 63736 -8,-13: - 2: 29696 + 3: 29696 -7,-12: - 2: 1808 + 3: 1808 -7,-11: - 2: 240 + 3: 240 -6,-11: - 2: 8192 + 3: 8192 -6,-10: - 2: 25262 + 3: 25262 -14,0: 0: 3598 -14,2: 0: 3598 - -14,-3: - 0: 3276 - -13,-4: - 0: 4096 + -13,-1: + 3: 3648 -11,9: - 2: 35980 + 3: 35980 -11,10: - 2: 51336 + 3: 51336 -10,8: - 2: 497 + 3: 497 0: 3084 -10,9: - 2: 449 + 3: 449 0: 3084 -10,10: - 2: 4593 + 3: 4593 0: 3084 -10,11: - 2: 227 + 3: 227 -9,9: 0: 2827 - 2: 21748 + 3: 21748 -9,10: 0: 2827 - 2: 58612 + 3: 58612 -9,11: - 2: 254 + 3: 254 -8,8: 0: 1799 - 2: 112 + 3: 112 -8,9: 0: 1799 - 2: 4208 + 3: 4208 -8,10: 0: 1799 - 2: 112 + 3: 112 -8,11: - 2: 48 + 3: 112 -15,-8: - 2: 34944 + 3: 34944 -14,-8: - 2: 64443 + 3: 64443 -15,-7: - 2: 136 + 3: 136 -14,-7: - 2: 64443 + 3: 64443 -14,-9: - 2: 61440 + 3: 61440 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -1576,6 +1570,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 immutable: True moles: @@ -1725,6 +1734,16 @@ entities: decals: 775: -33,-29 776: -33,-28 + - node: + color: '#FFFFFFFF' + id: Box + decals: + 914: -33,21 + 915: -32,21 + 916: -32,24 + 917: -33,24 + 926: -31,23 + 927: -31,22 - node: zIndex: 2 color: '#FFFFFFFF' @@ -1853,22 +1872,6 @@ entities: id: BrickTileSteelCornerSw decals: 625: 25,19 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: BrickTileSteelEndE - decals: - 468: -36,-11 - 469: -41,-11 - 470: -47,-11 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: BrickTileSteelEndW - decals: - 465: -50,-11 - 466: -43,-11 - 467: -38,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerNe @@ -1941,12 +1944,6 @@ entities: decals: 542: 0,-27 543: 0,-28 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: BrickTileSteelLineE - decals: - 479: -36,-9 - node: color: '#C3C3C3FF' id: BrickTileSteelLineN @@ -1982,15 +1979,6 @@ entities: id: BrickTileSteelLineN decals: 409: -11,-24 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: BrickTileSteelLineN - decals: - 471: -49,-11 - 472: -48,-11 - 473: -42,-11 - 474: -37,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelLineS @@ -2028,15 +2016,6 @@ entities: 622: 26,19 623: 27,19 624: 28,19 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: BrickTileSteelLineS - decals: - 475: -48,-11 - 476: -49,-11 - 477: -42,-11 - 478: -37,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelLineW @@ -2062,12 +2041,6 @@ entities: decals: 626: 25,20 627: 25,21 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: BrickTileSteelLineW - decals: - 480: -38,-9 - node: color: '#689F54FF' id: BrickTileWhiteCornerNe @@ -2182,11 +2155,10 @@ entities: decals: 501: 48,-8 - node: - zIndex: 2 - color: '#52B4E996' + color: '#759DBCFF' id: BrickTileWhiteInnerSe decals: - 581: 19,-13 + 975: 19,-18 - node: color: '#A4610696' id: BrickTileWhiteInnerSe @@ -2203,24 +2175,20 @@ entities: id: BrickTileWhiteInnerSw decals: 631: 19,15 - - node: - zIndex: 2 - color: '#FFFFFFFF' - id: BrickTileWhiteInnerSw - decals: - 576: 20,-18 - - node: - zIndex: 2 - color: '#52B4E996' - id: BrickTileWhiteLineE - decals: - 578: 19,-14 - node: color: '#689F54FF' id: BrickTileWhiteLineE decals: 789: -21,-8 790: -21,-7 + - node: + color: '#759DBCFF' + id: BrickTileWhiteLineE + decals: + 971: 19,-19 + 972: 20,-18 + 973: 20,-17 + 974: 20,-16 - node: zIndex: 2 color: '#EFB34196' @@ -2232,6 +2200,13 @@ entities: id: BrickTileWhiteLineN decals: 793: -22,-5 + - node: + color: '#759DBCFF' + id: BrickTileWhiteLineN + decals: + 979: 20,-16 + 980: 19,-16 + 981: 17,-16 - node: color: '#A4610696' id: BrickTileWhiteLineN @@ -2246,6 +2221,13 @@ entities: 582: 8,-18 583: 9,-18 589: 10,-18 + - node: + color: '#759DBCFF' + id: BrickTileWhiteLineS + decals: + 976: 20,-18 + 977: 17,-19 + 978: 19,-19 - node: color: '#A4610696' id: BrickTileWhiteLineS @@ -2264,14 +2246,6 @@ entities: decals: 590: -9,7 591: -13,7 - - node: - zIndex: 2 - color: '#FFFFFFFF' - id: BrickTileWhiteLineS - decals: - 573: 17,-18 - 574: 18,-18 - 575: 19,-18 - node: zIndex: 2 color: '#52B4E996' @@ -2289,6 +2263,14 @@ entities: 787: -23,-7 788: -23,-6 794: -23,-8 + - node: + color: '#759DBCFF' + id: BrickTileWhiteLineW + decals: + 968: 17,-19 + 969: 17,-18 + 970: 17,-17 + 982: 17,-16 - node: color: '#A4610696' id: BrickTileWhiteLineW @@ -2309,6 +2291,13 @@ entities: id: BrickTileWhiteLineW decals: 595: -14,8 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineW + decals: + 965: 18,-22 + 966: 18,-23 + 967: 18,-21 - node: color: '#FFFFFFFF' id: Caution @@ -2361,10 +2350,6 @@ entities: 361: -37,8 362: -37,9 363: -37,10 - 379: -37,-8 - 380: -37,-7 - 381: -37,-6 - 382: -37,-5 - node: color: '#FFFFFFFF' id: Delivery @@ -2445,8 +2430,6 @@ entities: 365: -36,1 366: -38,7 367: -40,8 - 368: -38,-4 - 369: -36,-8 370: -24,-9 371: -24,3 372: -25,2 @@ -2550,6 +2533,13 @@ entities: 15: 14,12 16: 15,12 17: 16,12 + - node: + color: '#AA4D53FF' + id: HalfTileOverlayGreyscale + decals: + 907: -32,19 + 908: -31,19 + 909: -30,19 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale @@ -2627,6 +2617,13 @@ entities: 312: 9,-12 327: 15,-12 328: 16,-12 + - node: + color: '#AA4D53FF' + id: HalfTileOverlayGreyscale180 + decals: + 897: -32,16 + 898: -31,16 + 899: -30,16 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale180 @@ -2696,6 +2693,16 @@ entities: 12: 12,12 154: 12,6 155: 12,7 + - node: + color: '#AA4D53FF' + id: HalfTileOverlayGreyscale270 + decals: + 880: -10,15 + 881: -10,14 + 893: -10,16 + 894: -33,17 + 895: -33,16 + 910: -33,18 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale270 @@ -2703,9 +2710,6 @@ entities: 802: -10,11 803: -10,12 804: -10,13 - 805: -10,14 - 806: -10,15 - 807: -10,16 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -2790,6 +2794,15 @@ entities: 161: 24,10 162: 24,9 163: 24,8 + - node: + color: '#AA4D53FF' + id: HalfTileOverlayGreyscale90 + decals: + 903: -29,17 + 904: -29,18 + 911: -35,18 + 912: -35,19 + 913: -35,16 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale90 @@ -2836,6 +2849,17 @@ entities: 211: 29,4 212: 29,5 213: 29,6 + - node: + color: '#FFFFFFFF' + id: LoadingArea + decals: + 984: 31,-20 + - node: + angle: 3.141592653589793 rad + color: '#FFFFFFFF' + id: LoadingArea + decals: + 985: 31,-18 - node: color: '#FFFFFFFF' id: MiniTileDarkLineN @@ -2879,37 +2903,6 @@ entities: decals: 825: -5,-13 826: -5,-12 - - node: - color: '#3AB3DA99' - id: MiniTileWhiteInnerSe - decals: - 457: -51,-12 - 458: -44,-12 - - node: - color: '#3AB3DA99' - id: MiniTileWhiteInnerSw - decals: - 456: -46,-12 - 459: -53,-12 - 462: -39,-12 - - node: - color: '#3AB3DA99' - id: MiniTileWhiteLineS - decals: - 448: -50,-12 - 449: -49,-12 - 450: -48,-12 - 451: -47,-12 - 452: -43,-12 - 453: -42,-12 - 454: -41,-12 - 455: -40,-12 - - node: - color: '#3AB3DA99' - id: MiniTileWhiteLineW - decals: - 460: -54,-11 - 461: -54,-10 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale @@ -2922,6 +2915,19 @@ entities: id: QuarterTileOverlayGreyscale decals: 123: 12,1 + - node: + color: '#848586FF' + id: QuarterTileOverlayGreyscale + decals: + 931: -37,10 + 932: -37,13 + 933: -37,14 + 934: -37,15 + 935: -37,16 + 944: -37,20 + 945: -37,21 + 946: -37,22 + 947: -37,23 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale @@ -2954,11 +2960,28 @@ entities: 330: 19,-10 331: 19,-9 332: 19,-8 + - node: + color: '#848586FF' + id: QuarterTileOverlayGreyscale180 + decals: + 936: -37,13 + 937: -37,14 + 938: -37,15 + 939: -37,16 + 940: -37,20 + 941: -37,21 + 942: -37,22 + 943: -37,23 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 decals: 37: 16,12 + - node: + color: '#AA4D53FF' + id: QuarterTileOverlayGreyscale180 + decals: + 896: -33,16 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 @@ -2980,6 +3003,16 @@ entities: decals: 94: 14,-5 294: 12,-6 + - node: + color: '#848586FF' + id: QuarterTileOverlayGreyscale270 + decals: + 954: -38,17 + 955: -38,18 + 956: -38,19 + 957: -36,19 + 958: -36,18 + 959: -36,17 - node: color: '#C05B60FF' id: QuarterTileOverlayGreyscale270 @@ -3009,6 +3042,16 @@ entities: 3: 4,24 4: 4,25 132: 4,23 + - node: + color: '#848586FF' + id: QuarterTileOverlayGreyscale90 + decals: + 948: -36,19 + 949: -36,18 + 950: -36,17 + 951: -38,19 + 952: -38,18 + 953: -38,17 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 @@ -3056,8 +3099,6 @@ entities: id: StandClear decals: 396: 21,24 - 463: -52,-12 - 464: -45,-12 532: 1,-30 - node: angle: 1.5707963267948966 rad @@ -3065,6 +3106,11 @@ entities: id: StandClear decals: 228: 60,2 + - node: + color: '#AA4D53FF' + id: ThreeQuarterTileOverlayGreyscale + decals: + 906: -33,19 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale @@ -3076,6 +3122,11 @@ entities: id: ThreeQuarterTileOverlayGreyscale180 decals: 309: 12,-12 + - node: + color: '#AA4D53FF' + id: ThreeQuarterTileOverlayGreyscale180 + decals: + 901: -29,16 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 @@ -3092,6 +3143,11 @@ entities: id: ThreeQuarterTileOverlayGreyscale90 decals: 306: 12,-8 + - node: + color: '#AA4D53FF' + id: ThreeQuarterTileOverlayGreyscale90 + decals: + 905: -29,19 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale90 @@ -3113,31 +3169,16 @@ entities: id: WarnCornerNE decals: 698: 68,3 - - node: - color: '#FFFFFFFF' - id: WarnCornerNE - decals: - 646: -41,-6 - node: color: '#FF0000FF' id: WarnCornerNW decals: 699: 66,3 - - node: - color: '#FFFFFFFF' - id: WarnCornerNW - decals: - 647: -43,-6 - node: color: '#FF0000FF' id: WarnCornerSE decals: 697: 68,1 - - node: - color: '#FFFFFFFF' - id: WarnCornerSE - decals: - 648: -41,-4 - node: color: '#FF0000FF' id: WarnCornerSW @@ -3145,9 +3186,14 @@ entities: 696: 66,1 - node: color: '#FFFFFFFF' - id: WarnCornerSW + id: WarnCornerSmallNW decals: - 649: -43,-4 + 963: -39,23 + - node: + color: '#FFFFFFFF' + id: WarnCornerSmallSW + decals: + 962: -39,18 - node: color: '#FFFFFFFF' id: WarnEndE @@ -3199,6 +3245,8 @@ entities: 663: 57,1 664: 57,0 795: -21,-6 + 922: -32,23 + 923: -32,22 - node: color: '#FF0000FF' id: WarnLineN @@ -3224,8 +3272,9 @@ entities: 535: -2,-29 536: -1,-29 537: 0,-29 - 650: -42,-4 703: 70,5 + 920: -33,22 + 921: -32,22 - node: color: '#C3C3C3FF' id: WarnLineS @@ -3267,6 +3316,8 @@ entities: 665: 59,7 666: 59,6 796: -19,-6 + 960: -39,17 + 961: -39,24 - node: color: '#FF0000FF' id: WarnLineW @@ -3283,7 +3334,8 @@ entities: 394: 21,24 395: 22,24 397: 20,24 - 651: -42,-6 + 918: -33,23 + 919: -32,23 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -3397,12 +3449,6 @@ entities: 708: -10,-2 832: -21,-13 842: -4,10 - - node: - zIndex: 2 - color: '#FFFFFFFF' - id: WoodTrimThinCornerSw - decals: - 603: -37,19 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw @@ -3482,12 +3528,6 @@ entities: 848: -1,10 849: -2,10 856: -3,10 - - node: - zIndex: 2 - color: '#FFFFFFFF' - id: WoodTrimThinLineS - decals: - 604: -36,19 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW @@ -3508,6 +3548,16 @@ entities: id: radiation decals: 655: 59,7 + - node: + color: '#FFFFFFFF' + id: space + decals: + 986: -21,-33 + - node: + color: '#010102FF' + id: taser + decals: + 989: -34,19 - type: OccluderTree - type: SpreaderGrid - type: Shuttle @@ -3539,6 +3589,14 @@ entities: - type: Transform pos: -11.470391,11.486723 parent: 31 +- proto: ActionToggleInternals + entities: + - uid: 3935 + components: + - type: Transform + parent: 3914 + - type: InstantAction + container: 3914 - proto: ActionToggleLight entities: - uid: 2470 @@ -3555,6 +3613,21 @@ entities: container: 7042 - proto: AirAlarm entities: + - uid: 160 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,20.5 + parent: 31 + - type: DeviceList + devices: + - 5537 + - 465 + - 2208 + - 6153 + - 9631 + - 6154 + - 469 - uid: 3855 components: - type: Transform @@ -3682,6 +3755,16 @@ entities: - 337 - 6080 - 6071 + - uid: 8830 + components: + - type: Transform + pos: -26.5,-28.5 + parent: 31 + - type: DeviceList + devices: + - 10785 + - 8849 + - 8309 - uid: 9042 components: - type: Transform @@ -3847,9 +3930,6 @@ entities: - 6168 - 6152 - 6151 - - 7745 - - 7746 - - 6169 - uid: 9998 components: - type: Transform @@ -3861,7 +3941,7 @@ entities: - 4860 - 6042 - 8795 - - 6024 + - 5977 - 4701 - 6032 - uid: 10003 @@ -4252,7 +4332,7 @@ entities: pos: 3.5,22.5 parent: 31 - type: Door - secondsUntilStateChange: -17204.738 + secondsUntilStateChange: -32364.002 state: Opening - type: DeviceLinkSource lastSignals: @@ -4540,6 +4620,18 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,-29.5 parent: 31 + - uid: 9843 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,24.5 + parent: 31 + - uid: 9854 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,17.5 + parent: 31 - uid: 10127 components: - type: Transform @@ -4763,15 +4855,17 @@ entities: - DoorStatus: DoorBolt - proto: AirlockExternalGlassShuttleArrivals entities: - - uid: 1755 + - uid: 6163 components: - type: Transform - pos: -51.5,-12.5 + rot: -1.5707963267948966 rad + pos: -41.5,24.5 parent: 31 - - uid: 9843 + - uid: 9750 components: - type: Transform - pos: -44.5,-12.5 + rot: -1.5707963267948966 rad + pos: -41.5,17.5 parent: 31 - proto: AirlockExternalGlassShuttleEmergencyLocked entities: @@ -4806,6 +4900,11 @@ entities: - type: Transform pos: -8.5,-42.5 parent: 31 + - uid: 8382 + components: + - type: Transform + pos: 31.5,-20.5 + parent: 31 - uid: 10766 components: - type: Transform @@ -4858,12 +4957,6 @@ entities: parent: 31 - proto: AirlockGlass entities: - - uid: 208 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,-2.5 - parent: 31 - uid: 588 components: - type: MetaData @@ -4878,12 +4971,6 @@ entities: - type: Transform pos: -25.5,10.5 parent: 31 - - uid: 710 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -36.5,-2.5 - parent: 31 - uid: 2032 components: - type: Transform @@ -4924,6 +5011,12 @@ entities: - type: Transform pos: 2.5,-12.5 parent: 31 + - uid: 4454 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,23.5 + parent: 31 - uid: 4577 components: - type: Transform @@ -4939,6 +5032,12 @@ entities: - type: Transform pos: 0.5,-16.5 parent: 31 + - uid: 7629 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,22.5 + parent: 31 - uid: 8280 components: - type: Transform @@ -4955,11 +5054,6 @@ entities: rot: -1.5707963267948966 rad pos: -28.5,-4.5 parent: 31 - - uid: 11398 - components: - - type: Transform - pos: -39.5,-4.5 - parent: 31 - proto: AirlockHeadOfPersonnelLocked entities: - uid: 1852 @@ -5032,11 +5126,6 @@ entities: - type: Transform pos: 26.5,-19.5 parent: 31 - - uid: 5216 - components: - - type: Transform - pos: -27.5,16.5 - parent: 31 - proto: AirlockMaintAtmoLocked entities: - uid: 6575 @@ -5103,11 +5192,6 @@ entities: rot: 3.141592653589793 rad pos: -32.5,-12.5 parent: 31 - - uid: 4104 - components: - - type: Transform - pos: -34.5,-5.5 - parent: 31 - uid: 5731 components: - type: Transform @@ -5295,6 +5379,12 @@ entities: - type: Transform pos: 18.5,-14.5 parent: 31 + - uid: 4225 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-19.5 + parent: 31 - uid: 7278 components: - type: Transform @@ -5485,12 +5575,22 @@ entities: parent: 31 - proto: AirlockSecurityLocked entities: + - uid: 437 + components: + - type: Transform + pos: -27.5,17.5 + parent: 31 - uid: 940 components: - type: Transform rot: 1.5707963267948966 rad pos: -16.5,14.5 parent: 31 + - uid: 4413 + components: + - type: Transform + pos: -33.5,16.5 + parent: 31 - proto: AirlockServiceLocked entities: - uid: 7593 @@ -5524,6 +5624,15 @@ entities: - type: Transform pos: -11.5,-20.5 parent: 31 + - uid: 469 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -36.5,20.5 + parent: 31 + - type: DeviceNetwork + deviceLists: + - 160 - uid: 1137 components: - type: Transform @@ -5553,6 +5662,14 @@ entities: - type: Transform pos: 27.5,20.5 parent: 31 + - uid: 8309 + components: + - type: Transform + pos: -23.5,-29.5 + parent: 31 + - type: DeviceNetwork + deviceLists: + - 8830 - uid: 10022 components: - type: Transform @@ -5583,6 +5700,14 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-27.5 parent: 31 + - uid: 10785 + components: + - type: Transform + pos: -27.5,-29.5 + parent: 31 + - type: DeviceNetwork + deviceLists: + - 8830 - uid: 10958 components: - type: Transform @@ -5644,6 +5769,12 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,24.5 parent: 31 + - uid: 10422 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-18.5 + parent: 31 - proto: AmmoniaCanister entities: - uid: 6707 @@ -5873,13 +6004,6 @@ entities: - type: Transform pos: 24.5,18.5 parent: 31 - - uid: 3797 - components: - - type: MetaData - name: Arrivals APC - - type: Transform - pos: -38.5,-8.5 - parent: 31 - uid: 3895 components: - type: MetaData @@ -6149,16 +6273,6 @@ entities: - type: Transform pos: -8.5,-42.5 parent: 31 - - uid: 10583 - components: - - type: Transform - pos: -51.5,-12.5 - parent: 31 - - uid: 10765 - components: - - type: Transform - pos: -44.5,-12.5 - parent: 31 - uid: 11466 components: - type: Transform @@ -6585,18 +6699,6 @@ entities: - type: Transform pos: -3.5,-11.5 parent: 31 -- proto: BarricadeBlock - entities: - - uid: 8481 - components: - - type: Transform - pos: -36.5,11.5 - parent: 31 - - uid: 8483 - components: - - type: Transform - pos: -38.5,16.5 - parent: 31 - proto: BarSignEngineChange entities: - uid: 9334 @@ -6617,11 +6719,6 @@ entities: - type: Transform pos: -0.5,14.5 parent: 31 - - uid: 11453 - components: - - type: Transform - pos: -0.5,-28.5 - parent: 31 - proto: BaseGasCondenser entities: - uid: 2949 @@ -6684,11 +6781,6 @@ entities: - type: Transform pos: -7.5,7.5 parent: 31 - - uid: 2011 - components: - - type: Transform - pos: 18.5,-20.5 - parent: 31 - uid: 2186 components: - type: Transform @@ -6699,11 +6791,6 @@ entities: - type: Transform pos: 12.5,23.5 parent: 31 - - uid: 3902 - components: - - type: Transform - pos: -33.5,18.5 - parent: 31 - uid: 4150 components: - type: Transform @@ -6809,13 +6896,6 @@ entities: - type: Transform pos: 25.5,-10.5 parent: 31 -- proto: BedsheetCosmos - entities: - - uid: 9081 - components: - - type: Transform - pos: -33.5,18.5 - parent: 31 - proto: BedsheetCult entities: - uid: 8462 @@ -7297,8 +7377,11 @@ entities: - uid: 2856 components: - type: Transform - pos: 0.53372324,-27.321005 + pos: 0.3974635,-27.366093 parent: 31 + - type: Physics + angularDamping: 0 + linearDamping: 0 - proto: BorgModulePka entities: - uid: 8230 @@ -7380,6 +7463,11 @@ entities: parent: 31 - proto: BoxFolderBase entities: + - uid: 10777 + components: + - type: Transform + pos: 19.308365,-18.4697 + parent: 31 - uid: 10831 components: - type: Transform @@ -7428,14 +7516,22 @@ entities: - uid: 499 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.369866,14.360475 + pos: -5.480619,13.916106 parent: 31 + - type: Physics + angularDamping: 0 + linearDamping: 0 - uid: 4630 components: - type: Transform pos: -1.6012349,14.621384 parent: 31 + - uid: 6681 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -29.575026,19.709541 + parent: 31 - proto: BoxFolderGrey entities: - uid: 6932 @@ -7475,6 +7571,12 @@ entities: - type: Physics angularDamping: 0 linearDamping: 0 + - uid: 5267 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.33789,18.5156 + parent: 31 - uid: 7329 components: - type: Transform @@ -7608,6 +7710,13 @@ entities: - type: Transform pos: -4.4147854,-11.857406 parent: 31 +- proto: BriefcaseBrownFilled + entities: + - uid: 10478 + components: + - type: Transform + pos: -38.29472,16.02765 + parent: 31 - proto: BrigTimer entities: - uid: 9951 @@ -7672,11 +7781,6 @@ entities: - type: Transform pos: 44.5,14.5 parent: 31 - - uid: 11940 - components: - - type: Transform - pos: 59.5,5.5 - parent: 31 - uid: 11941 components: - type: Transform @@ -7754,26 +7858,11 @@ entities: - type: Transform pos: 16.5,-1.5 parent: 31 - - uid: 167 - components: - - type: Transform - pos: -26.5,16.5 - parent: 31 - uid: 168 components: - type: Transform pos: 13.5,1.5 parent: 31 - - uid: 198 - components: - - type: Transform - pos: -27.5,16.5 - parent: 31 - - uid: 199 - components: - - type: Transform - pos: -28.5,16.5 - parent: 31 - uid: 200 components: - type: Transform @@ -7874,25 +7963,50 @@ entities: - type: Transform pos: -23.5,-13.5 parent: 31 - - uid: 420 + - uid: 481 components: - type: Transform - pos: -30.5,0.5 + pos: -39.5,17.5 parent: 31 - - uid: 421 + - uid: 483 components: - type: Transform - pos: -30.5,-0.5 + pos: -38.5,24.5 parent: 31 - - uid: 422 + - uid: 485 components: - type: Transform - pos: -32.5,-9.5 + pos: -34.5,22.5 parent: 31 - - uid: 437 + - uid: 486 components: - type: Transform - pos: -32.5,-10.5 + pos: -32.5,22.5 + parent: 31 + - uid: 488 + components: + - type: Transform + pos: -37.5,24.5 + parent: 31 + - uid: 489 + components: + - type: Transform + pos: -33.5,22.5 + parent: 31 + - uid: 512 + components: + - type: Transform + pos: -31.5,22.5 + parent: 31 + - uid: 519 + components: + - type: Transform + pos: -37.5,23.5 + parent: 31 + - uid: 521 + components: + - type: Transform + pos: -39.5,24.5 parent: 31 - uid: 528 components: @@ -9344,11 +9458,6 @@ entities: - type: Transform pos: -0.5,18.5 parent: 31 - - uid: 2591 - components: - - type: Transform - pos: -43.5,-11.5 - parent: 31 - uid: 2592 components: - type: Transform @@ -9579,36 +9688,6 @@ entities: - type: Transform pos: -36.5,-0.5 parent: 31 - - uid: 2646 - components: - - type: Transform - pos: -36.5,-2.5 - parent: 31 - - uid: 2647 - components: - - type: Transform - pos: -36.5,-3.5 - parent: 31 - - uid: 2648 - components: - - type: Transform - pos: -36.5,-4.5 - parent: 31 - - uid: 2649 - components: - - type: Transform - pos: -36.5,-5.5 - parent: 31 - - uid: 2650 - components: - - type: Transform - pos: -36.5,-6.5 - parent: 31 - - uid: 2651 - components: - - type: Transform - pos: -35.5,-6.5 - parent: 31 - uid: 2652 components: - type: Transform @@ -9989,6 +10068,11 @@ entities: - type: Transform pos: -3.5,-7.5 parent: 31 + - uid: 2807 + components: + - type: Transform + pos: -33.5,16.5 + parent: 31 - uid: 2808 components: - type: Transform @@ -11709,6 +11793,21 @@ entities: - type: Transform pos: -21.5,-29.5 parent: 31 + - uid: 3797 + components: + - type: Transform + pos: 18.5,-20.5 + parent: 31 + - uid: 3807 + components: + - type: Transform + pos: 18.5,-19.5 + parent: 31 + - uid: 3827 + components: + - type: Transform + pos: -32.5,16.5 + parent: 31 - uid: 3830 components: - type: Transform @@ -11974,11 +12073,6 @@ entities: - type: Transform pos: -42.5,8.5 parent: 31 - - uid: 4208 - components: - - type: Transform - pos: -38.5,-11.5 - parent: 31 - uid: 4212 components: - type: Transform @@ -12039,6 +12133,11 @@ entities: - type: Transform pos: 36.5,-12.5 parent: 31 + - uid: 4401 + components: + - type: Transform + pos: -26.5,24.5 + parent: 31 - uid: 4457 components: - type: Transform @@ -12174,6 +12273,11 @@ entities: - type: Transform pos: 8.5,-29.5 parent: 31 + - uid: 4744 + components: + - type: Transform + pos: -34.5,16.5 + parent: 31 - uid: 4745 components: - type: Transform @@ -12329,6 +12433,11 @@ entities: - type: Transform pos: -15.5,-37.5 parent: 31 + - uid: 4906 + components: + - type: Transform + pos: -30.5,16.5 + parent: 31 - uid: 4919 components: - type: Transform @@ -12619,11 +12728,6 @@ entities: - type: Transform pos: -15.5,-26.5 parent: 31 - - uid: 5773 - components: - - type: Transform - pos: -39.5,-11.5 - parent: 31 - uid: 5882 components: - type: Transform @@ -12634,16 +12738,6 @@ entities: - type: Transform pos: 46.5,24.5 parent: 31 - - uid: 5977 - components: - - type: Transform - pos: -40.5,-11.5 - parent: 31 - - uid: 5979 - components: - - type: Transform - pos: -37.5,-11.5 - parent: 31 - uid: 5993 components: - type: Transform @@ -12699,6 +12793,26 @@ entities: - type: Transform pos: 1.5,-30.5 parent: 31 + - uid: 6156 + components: + - type: Transform + pos: -36.5,21.5 + parent: 31 + - uid: 6157 + components: + - type: Transform + pos: -30.5,17.5 + parent: 31 + - uid: 6158 + components: + - type: Transform + pos: -29.5,-6.5 + parent: 31 + - uid: 6162 + components: + - type: Transform + pos: -36.5,19.5 + parent: 31 - uid: 6316 components: - type: Transform @@ -12919,6 +13033,11 @@ entities: - type: Transform pos: 36.5,10.5 parent: 31 + - uid: 6437 + components: + - type: Transform + pos: -36.5,20.5 + parent: 31 - uid: 6457 components: - type: Transform @@ -12944,6 +13063,11 @@ entities: - type: Transform pos: -25.5,-14.5 parent: 31 + - uid: 6494 + components: + - type: Transform + pos: -31.5,-7.5 + parent: 31 - uid: 6501 components: - type: Transform @@ -13104,6 +13228,21 @@ entities: - type: Transform pos: 52.5,2.5 parent: 31 + - uid: 6648 + components: + - type: Transform + pos: -27.5,24.5 + parent: 31 + - uid: 6649 + components: + - type: Transform + pos: -29.5,-7.5 + parent: 31 + - uid: 6650 + components: + - type: Transform + pos: -30.5,-7.5 + parent: 31 - uid: 6685 components: - type: Transform @@ -13114,6 +13253,11 @@ entities: - type: Transform pos: 7.5,11.5 parent: 31 + - uid: 6710 + components: + - type: Transform + pos: -35.5,16.5 + parent: 31 - uid: 6722 components: - type: Transform @@ -13439,20 +13583,20 @@ entities: - type: Transform pos: -6.5,-16.5 parent: 31 - - uid: 7637 + - uid: 7627 components: - type: Transform - pos: -37.5,-9.5 + pos: -30.5,18.5 parent: 31 - - uid: 7639 + - uid: 7642 components: - type: Transform - pos: -38.5,-9.5 + pos: -23.5,-29.5 parent: 31 - - uid: 7642 + - uid: 7654 components: - type: Transform - pos: -23.5,-29.5 + pos: -37.5,22.5 parent: 31 - uid: 7680 components: @@ -13609,6 +13753,11 @@ entities: - type: Transform pos: -24.5,3.5 parent: 31 + - uid: 7831 + components: + - type: Transform + pos: -27.5,27.5 + parent: 31 - uid: 7833 components: - type: Transform @@ -13654,10 +13803,20 @@ entities: - type: Transform pos: -21.5,-5.5 parent: 31 + - uid: 7947 + components: + - type: Transform + pos: -27.5,25.5 + parent: 31 + - uid: 7963 + components: + - type: Transform + pos: -27.5,26.5 + parent: 31 - uid: 8040 components: - type: Transform - pos: -38.5,-8.5 + pos: -35.5,22.5 parent: 31 - uid: 8053 components: @@ -13889,15 +14048,15 @@ entities: - type: Transform pos: -2.5,-26.5 parent: 31 - - uid: 8297 + - uid: 8296 components: - type: Transform - pos: -40.5,-9.5 + pos: -31.5,16.5 parent: 31 - - uid: 8298 + - uid: 8297 components: - type: Transform - pos: -39.5,-9.5 + pos: -35.5,17.5 parent: 31 - uid: 8313 components: @@ -13939,6 +14098,11 @@ entities: - type: Transform pos: 33.5,21.5 parent: 31 + - uid: 8383 + components: + - type: Transform + pos: -36.5,22.5 + parent: 31 - uid: 8394 components: - type: Transform @@ -14039,6 +14203,11 @@ entities: - type: Transform pos: 49.5,-18.5 parent: 31 + - uid: 8635 + components: + - type: Transform + pos: -29.5,27.5 + parent: 31 - uid: 8677 components: - type: Transform @@ -14434,6 +14603,11 @@ entities: - type: Transform pos: 3.5,8.5 parent: 31 + - uid: 9013 + components: + - type: Transform + pos: -28.5,27.5 + parent: 31 - uid: 9133 components: - type: Transform @@ -14459,35 +14633,10 @@ entities: - type: Transform pos: -7.5,15.5 parent: 31 - - uid: 9210 - components: - - type: Transform - pos: -36.5,-7.5 - parent: 31 - - uid: 9211 - components: - - type: Transform - pos: -36.5,-8.5 - parent: 31 - - uid: 9212 - components: - - type: Transform - pos: -36.5,-9.5 - parent: 31 - - uid: 9213 - components: - - type: Transform - pos: -36.5,-10.5 - parent: 31 - - uid: 9214 - components: - - type: Transform - pos: -36.5,-11.5 - parent: 31 - - uid: 9215 + - uid: 9197 components: - type: Transform - pos: -37.5,-4.5 + pos: 18.5,-18.5 parent: 31 - uid: 9216 components: @@ -14599,26 +14748,6 @@ entities: - type: Transform pos: 24.5,20.5 parent: 31 - - uid: 9629 - components: - - type: Transform - pos: -41.5,-9.5 - parent: 31 - - uid: 9630 - components: - - type: Transform - pos: -42.5,-9.5 - parent: 31 - - uid: 9631 - components: - - type: Transform - pos: -41.5,-11.5 - parent: 31 - - uid: 9632 - components: - - type: Transform - pos: -42.5,-11.5 - parent: 31 - uid: 9727 components: - type: Transform @@ -14889,6 +15018,11 @@ entities: - type: Transform pos: -10.5,25.5 parent: 31 + - uid: 10438 + components: + - type: Transform + pos: -34.5,23.5 + parent: 31 - uid: 10496 components: - type: Transform @@ -15199,100 +15333,15 @@ entities: - type: Transform pos: -13.5,6.5 parent: 31 - - uid: 10750 - components: - - type: Transform - pos: -7.5,10.5 - parent: 31 - - uid: 10768 - components: - - type: Transform - pos: -44.5,-11.5 - parent: 31 - - uid: 10769 - components: - - type: Transform - pos: -45.5,-11.5 - parent: 31 - - uid: 10770 - components: - - type: Transform - pos: -46.5,-11.5 - parent: 31 - - uid: 10771 - components: - - type: Transform - pos: -47.5,-11.5 - parent: 31 - - uid: 10772 - components: - - type: Transform - pos: -48.5,-11.5 - parent: 31 - - uid: 10773 - components: - - type: Transform - pos: -49.5,-11.5 - parent: 31 - - uid: 10774 - components: - - type: Transform - pos: -50.5,-11.5 - parent: 31 - - uid: 10775 - components: - - type: Transform - pos: -51.5,-11.5 - parent: 31 - - uid: 10776 - components: - - type: Transform - pos: -52.5,-11.5 - parent: 31 - - uid: 10777 - components: - - type: Transform - pos: -43.5,-9.5 - parent: 31 - - uid: 10778 - components: - - type: Transform - pos: -44.5,-9.5 - parent: 31 - - uid: 10779 - components: - - type: Transform - pos: -45.5,-9.5 - parent: 31 - - uid: 10780 - components: - - type: Transform - pos: -46.5,-9.5 - parent: 31 - - uid: 10781 - components: - - type: Transform - pos: -47.5,-9.5 - parent: 31 - - uid: 10782 - components: - - type: Transform - pos: -48.5,-9.5 - parent: 31 - - uid: 10783 - components: - - type: Transform - pos: -49.5,-9.5 - parent: 31 - - uid: 10784 + - uid: 10748 components: - type: Transform - pos: -50.5,-9.5 + pos: -34.5,24.5 parent: 31 - - uid: 10785 + - uid: 10750 components: - type: Transform - pos: -51.5,-9.5 + pos: -7.5,10.5 parent: 31 - uid: 10787 components: @@ -15854,21 +15903,6 @@ entities: - type: Transform pos: 48.5,21.5 parent: 31 - - uid: 11415 - components: - - type: Transform - pos: -38.5,-4.5 - parent: 31 - - uid: 11416 - components: - - type: Transform - pos: -39.5,-4.5 - parent: 31 - - uid: 11417 - components: - - type: Transform - pos: -40.5,-4.5 - parent: 31 - uid: 11421 components: - type: Transform @@ -17196,6 +17230,31 @@ entities: - type: Transform pos: -18.5,15.5 parent: 31 + - uid: 2566 + components: + - type: Transform + pos: -27.5,25.5 + parent: 31 + - uid: 2591 + components: + - type: Transform + pos: -27.5,26.5 + parent: 31 + - uid: 2646 + components: + - type: Transform + pos: -27.5,27.5 + parent: 31 + - uid: 2647 + components: + - type: Transform + pos: -28.5,27.5 + parent: 31 + - uid: 2648 + components: + - type: Transform + pos: -29.5,27.5 + parent: 31 - uid: 2672 components: - type: Transform @@ -18706,6 +18765,11 @@ entities: - type: Transform pos: -22.5,19.5 parent: 31 + - uid: 4955 + components: + - type: Transform + pos: -31.5,27.5 + parent: 31 - uid: 4992 components: - type: Transform @@ -18736,41 +18800,26 @@ entities: - type: Transform pos: 35.5,11.5 parent: 31 - - uid: 5041 - components: - - type: Transform - pos: -28.5,24.5 - parent: 31 - uid: 5098 components: - type: Transform pos: 36.5,12.5 parent: 31 - - uid: 5168 + - uid: 5165 components: - type: Transform - pos: -29.5,24.5 + pos: -33.5,27.5 parent: 31 - uid: 5169 components: - type: Transform pos: -33.5,30.5 parent: 31 - - uid: 5170 - components: - - type: Transform - pos: -30.5,24.5 - parent: 31 - uid: 5174 components: - type: Transform pos: -33.5,34.5 parent: 31 - - uid: 5180 - components: - - type: Transform - pos: -33.5,29.5 - parent: 31 - uid: 5200 components: - type: Transform @@ -18896,6 +18945,11 @@ entities: - type: Transform pos: -4.5,25.5 parent: 31 + - uid: 5979 + components: + - type: Transform + pos: -33.5,28.5 + parent: 31 - uid: 5987 components: - type: Transform @@ -19431,6 +19485,11 @@ entities: - type: Transform pos: -26.5,-29.5 parent: 31 + - uid: 8483 + components: + - type: Transform + pos: -32.5,27.5 + parent: 31 - uid: 8485 components: - type: Transform @@ -21115,16 +21174,6 @@ entities: - type: Transform pos: 42.5,1.5 parent: 31 - - uid: 160 - components: - - type: Transform - pos: -36.5,-6.5 - parent: 31 - - uid: 396 - components: - - type: Transform - pos: -34.5,-5.5 - parent: 31 - uid: 407 components: - type: Transform @@ -21335,11 +21384,6 @@ entities: - type: Transform pos: -21.5,12.5 parent: 31 - - uid: 2071 - components: - - type: Transform - pos: -35.5,-5.5 - parent: 31 - uid: 2088 components: - type: Transform @@ -22220,11 +22264,6 @@ entities: - type: Transform pos: -32.5,-6.5 parent: 31 - - uid: 3804 - components: - - type: Transform - pos: -35.5,-6.5 - parent: 31 - uid: 3809 components: - type: Transform @@ -22750,26 +22789,6 @@ entities: - type: Transform pos: -11.5,-11.5 parent: 31 - - uid: 8029 - components: - - type: Transform - pos: -36.5,-7.5 - parent: 31 - - uid: 8030 - components: - - type: Transform - pos: -36.5,-8.5 - parent: 31 - - uid: 8031 - components: - - type: Transform - pos: -37.5,-8.5 - parent: 31 - - uid: 8039 - components: - - type: Transform - pos: -38.5,-8.5 - parent: 31 - uid: 8041 components: - type: Transform @@ -23967,6 +23986,16 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,33.5 parent: 31 + - uid: 2065 + components: + - type: Transform + pos: -29.5,-0.5 + parent: 31 + - uid: 2071 + components: + - type: Transform + pos: -30.5,-0.5 + parent: 31 - uid: 2278 components: - type: Transform @@ -24103,12 +24132,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-7.5 parent: 31 - - uid: 10149 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -29.5,-0.5 - parent: 31 - uid: 10151 components: - type: Transform @@ -24120,11 +24143,6 @@ entities: - type: Transform pos: -30.5,-1.5 parent: 31 - - uid: 10153 - components: - - type: Transform - pos: -30.5,-0.5 - parent: 31 - uid: 11162 components: - type: Transform @@ -24234,21 +24252,6 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,-9.5 parent: 31 - - uid: 11074 - components: - - type: Transform - pos: -33.5,18.5 - parent: 31 - - uid: 11075 - components: - - type: Transform - pos: -33.5,17.5 - parent: 31 - - uid: 11076 - components: - - type: Transform - pos: -34.5,17.5 - parent: 31 - proto: CarpetGreen entities: - uid: 2452 @@ -24342,6 +24345,16 @@ entities: parent: 31 - proto: CarpetPurple entities: + - uid: 199 + components: + - type: Transform + pos: -8.5,-20.5 + parent: 31 + - uid: 396 + components: + - type: Transform + pos: -9.5,-20.5 + parent: 31 - uid: 1698 components: - type: Transform @@ -24518,6 +24531,16 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,-21.5 parent: 31 + - uid: 10783 + components: + - type: Transform + pos: -8.5,-21.5 + parent: 31 + - uid: 10784 + components: + - type: Transform + pos: -9.5,-21.5 + parent: 31 - uid: 10812 components: - type: Transform @@ -24768,6 +24791,12 @@ entities: - type: Transform pos: -3.5,21.5 parent: 31 + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,19.5 + parent: 31 - uid: 187 components: - type: Transform @@ -24913,6 +24942,12 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,17.5 parent: 31 + - uid: 1310 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,17.5 + parent: 31 - uid: 1427 components: - type: Transform @@ -24994,6 +25029,11 @@ entities: - type: Transform pos: 12.5,18.5 parent: 31 + - uid: 2212 + components: + - type: Transform + pos: -32.5,27.5 + parent: 31 - uid: 2275 components: - type: Transform @@ -25010,12 +25050,23 @@ entities: - type: Transform pos: 27.5,-13.5 parent: 31 + - uid: 2441 + components: + - type: Transform + pos: -33.5,27.5 + parent: 31 - uid: 2491 components: - type: Transform rot: -1.5707963267948966 rad pos: -18.5,14.5 parent: 31 + - uid: 2557 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,24.5 + parent: 31 - uid: 2866 components: - type: Transform @@ -25204,6 +25255,18 @@ entities: - type: Transform pos: 51.5,-10.5 parent: 31 + - uid: 4411 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,15.5 + parent: 31 + - uid: 4412 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,20.5 + parent: 31 - uid: 4420 components: - type: Transform @@ -25254,6 +25317,11 @@ entities: - type: Transform pos: 8.5,13.5 parent: 31 + - uid: 4862 + components: + - type: Transform + pos: -0.5,-31.5 + parent: 31 - uid: 5017 components: - type: Transform @@ -25379,11 +25447,6 @@ entities: - type: Transform pos: -37.5,41.5 parent: 31 - - uid: 5175 - components: - - type: Transform - pos: -33.5,30.5 - parent: 31 - uid: 5181 components: - type: Transform @@ -25399,16 +25462,6 @@ entities: - type: Transform pos: -33.5,39.5 parent: 31 - - uid: 5192 - components: - - type: Transform - pos: -33.5,27.5 - parent: 31 - - uid: 5220 - components: - - type: Transform - pos: -33.5,28.5 - parent: 31 - uid: 5246 components: - type: Transform @@ -25434,11 +25487,6 @@ entities: - type: Transform pos: -33.5,33.5 parent: 31 - - uid: 5270 - components: - - type: Transform - pos: -33.5,25.5 - parent: 31 - uid: 5272 components: - type: Transform @@ -25520,6 +25568,12 @@ entities: rot: 1.5707963267948966 rad pos: 46.5,7.5 parent: 31 + - uid: 5610 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,16.5 + parent: 31 - uid: 5730 components: - type: Transform @@ -25567,36 +25621,6 @@ entities: - type: Transform pos: 30.5,20.5 parent: 31 - - uid: 6648 - components: - - type: Transform - pos: -27.5,24.5 - parent: 31 - - uid: 6649 - components: - - type: Transform - pos: -28.5,24.5 - parent: 31 - - uid: 6650 - components: - - type: Transform - pos: -29.5,24.5 - parent: 31 - - uid: 6651 - components: - - type: Transform - pos: -30.5,24.5 - parent: 31 - - uid: 6652 - components: - - type: Transform - pos: -31.5,24.5 - parent: 31 - - uid: 6653 - components: - - type: Transform - pos: -32.5,24.5 - parent: 31 - uid: 6676 components: - type: Transform @@ -25684,6 +25708,12 @@ entities: - type: Transform pos: 12.5,16.5 parent: 31 + - uid: 7358 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,18.5 + parent: 31 - uid: 7494 components: - type: Transform @@ -25825,11 +25855,6 @@ entities: - type: Transform pos: -30.5,14.5 parent: 31 - - uid: 7618 - components: - - type: Transform - pos: -29.5,14.5 - parent: 31 - uid: 7619 components: - type: Transform @@ -25860,11 +25885,6 @@ entities: - type: Transform pos: -23.5,14.5 parent: 31 - - uid: 7654 - components: - - type: Transform - pos: -8.5,25.5 - parent: 31 - uid: 7655 components: - type: Transform @@ -26192,6 +26212,12 @@ entities: - type: Transform pos: 23.5,-13.5 parent: 31 + - uid: 7968 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,26.5 + parent: 31 - uid: 7974 components: - type: Transform @@ -26227,6 +26253,12 @@ entities: - type: Transform pos: 21.5,1.5 parent: 31 + - uid: 8026 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,27.5 + parent: 31 - uid: 8076 components: - type: Transform @@ -26248,16 +26280,46 @@ entities: - type: Transform pos: 56.5,7.5 parent: 31 - - uid: 8507 + - uid: 8300 components: - type: Transform - pos: -25.5,-29.5 + rot: -1.5707963267948966 rad + pos: -19.5,19.5 + parent: 31 + - uid: 8380 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,19.5 parent: 31 - uid: 8510 components: - type: Transform pos: -24.5,-29.5 parent: 31 + - uid: 8592 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,27.5 + parent: 31 + - uid: 8595 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,19.5 + parent: 31 + - uid: 8630 + components: + - type: Transform + pos: -33.5,31.5 + parent: 31 + - uid: 8634 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,19.5 + parent: 31 - uid: 8655 components: - type: Transform @@ -26313,6 +26375,11 @@ entities: - type: Transform pos: -5.5,-9.5 parent: 31 + - uid: 8745 + components: + - type: Transform + pos: -31.5,27.5 + parent: 31 - uid: 8754 components: - type: Transform @@ -26360,6 +26427,12 @@ entities: - type: Transform pos: -8.5,-9.5 parent: 31 + - uid: 9228 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,19.5 + parent: 31 - uid: 9264 components: - type: Transform @@ -26384,7 +26457,8 @@ entities: - uid: 9281 components: - type: Transform - pos: -0.5,-31.5 + rot: -1.5707963267948966 rad + pos: -24.5,19.5 parent: 31 - uid: 9285 components: @@ -26442,6 +26516,12 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,25.5 parent: 31 + - uid: 9632 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,25.5 + parent: 31 - uid: 9706 components: - type: Transform @@ -27267,10 +27347,10 @@ entities: parent: 31 - proto: Cautery entities: - - uid: 3040 + - uid: 9630 components: - type: Transform - pos: 19.023205,-18.200846 + pos: 17.656164,-20.704298 parent: 31 - proto: Chair entities: @@ -27308,6 +27388,12 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,15.5 parent: 31 + - uid: 2773 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 32.5,-19.5 + parent: 31 - uid: 3379 components: - type: Transform @@ -27344,12 +27430,6 @@ entities: rot: -1.5707963267948966 rad pos: 35.5,-12.5 parent: 31 - - uid: 4634 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 31.5,-19.5 - parent: 31 - uid: 4709 components: - type: Transform @@ -27385,6 +27465,12 @@ entities: rot: -1.5707963267948966 rad pos: 35.5,-14.5 parent: 31 + - uid: 7285 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -38.5,16.5 + parent: 31 - uid: 7286 components: - type: Transform @@ -27400,11 +27486,11 @@ entities: - type: Transform pos: 8.5,1.5 parent: 31 - - uid: 7627 + - uid: 7475 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,17.5 + rot: 1.5707963267948966 rad + pos: -38.5,15.5 parent: 31 - uid: 7774 components: @@ -27567,6 +27653,12 @@ entities: rot: 3.141592653589793 rad pos: 15.5,15.5 parent: 31 + - uid: 11075 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-18.5 + parent: 31 - uid: 11088 components: - type: Transform @@ -27655,32 +27747,10 @@ entities: rot: -1.5707963267948966 rad pos: 54.76348,-23.148035 parent: 31 - - uid: 10755 - components: - - type: Transform - pos: -40.5,-9.5 - parent: 31 - - uid: 10756 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -49.5,-9.5 - parent: 31 - - uid: 10757 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -46.5,-9.5 - parent: 31 - - uid: 10762 - components: - - type: Transform - pos: -42.5,-9.5 - parent: 31 - - uid: 10763 + - uid: 10440 components: - type: Transform - pos: -41.5,-9.5 + pos: -34.45191,20.973764 parent: 31 - proto: ChairFoldingSpawnFolded entities: @@ -27806,6 +27876,18 @@ entities: rot: 3.141592653589793 rad pos: 9.5,-29.5 parent: 31 + - uid: 5164 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -29.43565,18.722628 + parent: 31 + - uid: 5168 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,19.5 + parent: 31 - uid: 5870 components: - type: Transform @@ -27956,12 +28038,6 @@ entities: rot: -1.5707963267948966 rad pos: -16.70261,-19.400406 parent: 31 - - uid: 7077 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,-16.5 - parent: 31 - uid: 7272 components: - type: Transform @@ -28196,13 +28272,6 @@ entities: - type: Transform pos: 24.491184,-6.41413 parent: 31 -- proto: CheckerBoard - entities: - - uid: 10764 - components: - - type: Transform - pos: -48.183727,-9.500211 - parent: 31 - proto: chem_master entities: - uid: 606 @@ -28401,17 +28470,10 @@ entities: - type: Transform pos: 6.5,14.5 parent: 31 - - uid: 10754 - components: - - type: Transform - pos: -53.5,-9.5 - parent: 31 -- proto: ClosetFireFilled - entities: - - uid: 10753 + - uid: 10995 components: - type: Transform - pos: -53.5,-10.5 + pos: 29.5,-19.5 parent: 31 - proto: ClosetL3VirologyFilled entities: @@ -28427,6 +28489,13 @@ entities: - type: Transform pos: -17.5,13.5 parent: 31 +- proto: ClosetRadiationSuitFilled + entities: + - uid: 7472 + components: + - type: Transform + pos: -8.5,-25.5 + parent: 31 - proto: ClosetWallEmergency entities: - uid: 8729 @@ -28532,6 +28601,12 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,27.5 parent: 31 + - uid: 5198 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,25.5 + parent: 31 - uid: 6607 components: - type: Transform @@ -28618,6 +28693,12 @@ entities: rot: 3.141592653589793 rad pos: 52.5,0.5 parent: 31 + - uid: 2029 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -39.5,25.5 + parent: 31 - uid: 3135 components: - type: Transform @@ -28635,6 +28716,24 @@ entities: - type: Transform pos: 30.5,15.5 parent: 31 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 7302 components: - type: Transform @@ -28811,12 +28910,6 @@ entities: rot: 3.141592653589793 rad pos: -34.5,-28.5 parent: 31 - - uid: 3245 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-26.5 - parent: 31 - proto: ClosetWallWhite entities: - uid: 1890 @@ -28893,6 +28986,11 @@ entities: parent: 31 - proto: ClothingEyesHudDiagnostic entities: + - uid: 251 + components: + - type: Transform + pos: 0.0907567,-27.589718 + parent: 31 - uid: 8705 components: - type: Transform @@ -28931,19 +29029,19 @@ entities: - type: Transform pos: 51.410316,17.602825 parent: 31 -- proto: ClothingHandsGlovesFingerlessInsulated +- proto: ClothingHandsGlovesFingerless entities: - - uid: 108 + - uid: 10758 components: - type: Transform - pos: -20.576214,18.40477 + pos: -38.516087,20.885221 parent: 31 -- proto: ClothingHandsGlovesLatex +- proto: ClothingHandsGlovesFingerlessInsulated entities: - - uid: 2212 + - uid: 108 components: - type: Transform - pos: 19.45916,-20.403913 + pos: -20.576214,18.40477 parent: 31 - proto: ClothingHandsGlovesLeather entities: @@ -28954,10 +29052,10 @@ entities: parent: 31 - proto: ClothingHandsGlovesNitrile entities: - - uid: 10029 + - uid: 6770 components: - type: Transform - pos: 19.51705,-18.456926 + pos: 17.426996,-21.527786 parent: 31 - proto: ClothingHeadHatAnimalCatBlack entities: @@ -28994,6 +29092,19 @@ entities: - type: Transform pos: -20.343632,-10.914085 parent: 31 +- proto: ClothingHeadHatParamedicsoft + entities: + - uid: 6768 + components: + - type: MetaData + desc: Gray fur pokes out the side. + name: A Bird Fitted Hat. + - type: Transform + pos: -36.582413,-29.18018 + parent: 31 + - type: Physics + angularDamping: 0 + linearDamping: 0 - proto: ClothingHeadHatPirate entities: - uid: 4503 @@ -29001,6 +29112,13 @@ entities: - type: Transform pos: 36.423782,-15.13722 parent: 31 +- proto: ClothingHeadHatSecsoftFlipped + entities: + - uid: 5546 + components: + - type: Transform + pos: -29.231518,16.674196 + parent: 31 - proto: ClothingHeadHatWelding entities: - uid: 71 @@ -29008,6 +29126,13 @@ entities: - type: Transform pos: -1.6376766,-24.290537 parent: 31 +- proto: ClothingHeadMailCarrier + entities: + - uid: 11399 + components: + - type: Transform + pos: 18.336111,17.207779 + parent: 31 - proto: ClothingHeadsetGrey entities: - uid: 10480 @@ -29018,6 +29143,11 @@ entities: parent: 31 - proto: ClothingMaskBreath entities: + - uid: 3840 + components: + - type: Transform + pos: 33.772503,-18.70499 + parent: 31 - uid: 4147 components: - type: Transform @@ -29028,13 +29158,6 @@ entities: - type: Transform pos: 43.593338,-13.568842 parent: 31 -- proto: ClothingMaskBreathMedical - entities: - - uid: 10027 - components: - - type: Transform - pos: 18.631598,-18.486423 - parent: 31 - proto: ClothingMaskGas entities: - uid: 7970 @@ -29065,10 +29188,11 @@ entities: parent: 31 - proto: ClothingMaskSterile entities: - - uid: 9034 + - uid: 6653 components: - type: Transform - pos: 19.448904,-20.24775 + rot: 3.141592653589793 rad + pos: 17.395657,-21.249128 parent: 31 - proto: ClothingNeckBling entities: @@ -29080,13 +29204,6 @@ entities: - type: Physics angularDamping: 0 linearDamping: 0 -- proto: ClothingNeckCloakTrans - entities: - - uid: 9748 - components: - - type: Transform - pos: -28.4315,17.631725 - parent: 31 - proto: ClothingNeckNonBinaryPin entities: - uid: 11135 @@ -29101,6 +29218,13 @@ entities: - type: Transform pos: -13.566107,24.548891 parent: 31 +- proto: ClothingNeckScarfStripedLightBlue + entities: + - uid: 7504 + components: + - type: Transform + pos: -30.30171,22.799067 + parent: 31 - proto: ClothingNeckScarfStripedRed entities: - uid: 10690 @@ -29147,6 +29271,11 @@ entities: parent: 31 - proto: ClothingOuterCoatJensen entities: + - uid: 1679 + components: + - type: Transform + pos: -26.65825,13.601047 + parent: 31 - uid: 9758 components: - type: Transform @@ -29157,6 +29286,13 @@ entities: - type: Transform pos: -31.464373,10.564828 parent: 31 +- proto: ClothingOuterCoatLettermanBlue + entities: + - uid: 9116 + components: + - type: Transform + pos: -36.726986,25.720987 + parent: 31 - proto: ClothingOuterCoatPirate entities: - uid: 7065 @@ -29201,11 +29337,24 @@ entities: parent: 31 - proto: ClothingOuterWinterCoat entities: + - uid: 7350 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -36.26865,25.470814 + parent: 31 - uid: 7644 components: - type: Transform pos: 7.310254,-13.535391 parent: 31 +- proto: ClothingOuterWinterCoatMail + entities: + - uid: 11400 + components: + - type: Transform + pos: 18.627777,16.665735 + parent: 31 - proto: ClothingOuterWinterHoP entities: - uid: 10828 @@ -29229,14 +29378,6 @@ entities: rot: -1.5707963267948966 rad pos: 29.360077,8.344849 parent: 31 -- proto: ClothingOuterWinterRD - entities: - - uid: 9116 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.6681519,-23.621525 - parent: 31 - proto: ClothingShoesBootsJack entities: - uid: 10692 @@ -29271,13 +29412,6 @@ entities: - type: Transform pos: 58.78938,-5.6705165 parent: 31 -- proto: ClothingShoesBootsPerformer - entities: - - uid: 8319 - components: - - type: Transform - pos: 29.355263,-21.266848 - parent: 31 - proto: ClothingShoesCult entities: - uid: 2066 @@ -29333,14 +29467,6 @@ entities: - type: Transform pos: -29.677063,7.9308863 parent: 31 -- proto: ClothingUniformJumpsuitBartender - entities: - - uid: 11109 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -34.617214,17.30891 - parent: 31 - proto: ClothingUniformJumpsuitHawaiRed entities: - uid: 6972 @@ -29361,17 +29487,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-20.5 parent: 31 - - uid: 519 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,16.5 - parent: 31 - - uid: 732 - components: - - type: Transform - pos: -31.5,18.5 - parent: 31 - uid: 736 components: - type: Transform @@ -29513,11 +29628,11 @@ entities: - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver - proto: computerBodyScanner entities: - - uid: 7285 + - uid: 8289 components: - type: Transform rot: -1.5707963267948966 rad - pos: 20.5,-15.5 + pos: 19.5,-20.5 parent: 31 - proto: ComputerBroken entities: @@ -29562,11 +29677,11 @@ entities: parent: 31 - proto: ComputerCloningConsole entities: - - uid: 11686 + - uid: 10771 components: - type: Transform rot: -1.5707963267948966 rad - pos: 10.5,-16.5 + pos: 20.5,-16.5 parent: 31 - proto: ComputerComms entities: @@ -29621,39 +29736,12 @@ entities: - type: Transform pos: 7.5,21.5 parent: 31 - - uid: 1113 - components: - - type: Transform - pos: -3.5,-19.5 - parent: 31 - - uid: 2065 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,21.5 - parent: 31 - - uid: 2204 - components: - - type: Transform - pos: 29.5,10.5 - parent: 31 - uid: 2536 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,32.5 parent: 31 - - uid: 6840 - components: - - type: Transform - pos: 24.5,-9.5 - parent: 31 - - uid: 11014 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,0.5 - parent: 31 - proto: ComputerMedicalRecords entities: - uid: 5812 @@ -29715,7 +29803,7 @@ entities: - type: Transform pos: 3.5,35.5 parent: 31 - - uid: 4244 + - uid: 4133 components: - type: Transform pos: -4.5,-19.5 @@ -29733,6 +29821,11 @@ entities: - type: Transform pos: 54.5,-22.5 parent: 31 + - uid: 10770 + components: + - type: Transform + pos: -2.5,-25.5 + parent: 31 - proto: ComputerShuttleSalvage entities: - uid: 6644 @@ -29796,6 +29889,12 @@ entities: rot: 3.141592653589793 rad pos: 0.5,31.5 parent: 31 + - uid: 10778 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,12.5 + parent: 31 - proto: ComputerTechnologyDiskTerminal entities: - uid: 591 @@ -30086,10 +30185,10 @@ entities: - 10218 - proto: CrateArtifactContainer entities: - - uid: 99 + - uid: 10769 components: - type: Transform - pos: -8.5,-31.5 + pos: -9.5,-25.5 parent: 31 - proto: CrateCoffin entities: @@ -30105,11 +30204,6 @@ entities: - type: Transform pos: 10.5,13.5 parent: 31 - - uid: 10012 - components: - - type: Transform - pos: 18.5,15.5 - parent: 31 - proto: CrateEngineeringCableBulk entities: - uid: 3553 @@ -30213,6 +30307,11 @@ entities: parent: 31 - proto: CrateMedicalScrubs entities: + - uid: 6769 + components: + - type: Transform + pos: 20.5,-17.5 + parent: 31 - uid: 11451 components: - type: Transform @@ -30220,10 +30319,10 @@ entities: parent: 31 - proto: CrateMedicalSurgery entities: - - uid: 7264 + - uid: 4064 components: - type: Transform - pos: 20.5,-17.5 + pos: 17.5,-22.5 parent: 31 - proto: CratePrivateSecure entities: @@ -30337,11 +30436,10 @@ entities: available: False - proto: CrowbarRed entities: - - uid: 7562 + - uid: 10756 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -52.74314,-11.621845 + pos: -38.384834,20.491472 parent: 31 - uid: 11832 components: @@ -30350,27 +30448,27 @@ entities: parent: 31 - proto: CryogenicSleepUnit entities: - - uid: 8027 + - uid: 9212 components: - type: Transform - pos: -42.5,-5.5 + pos: -31.5,24.5 parent: 31 - - uid: 9172 + - uid: 9215 components: - type: Transform - pos: -42.5,-3.5 + pos: -32.5,21.5 parent: 31 - - uid: 9184 +- proto: CryogenicSleepUnitSpawnerLateJoin + entities: + - uid: 9739 components: - type: Transform - pos: -40.5,-3.5 + pos: -32.5,24.5 parent: 31 -- proto: CryogenicSleepUnitSpawnerLateJoin - entities: - - uid: 9197 + - uid: 9748 components: - type: Transform - pos: -40.5,-5.5 + pos: -31.5,21.5 parent: 31 - proto: CryoPod entities: @@ -30665,16 +30763,15 @@ entities: parent: 31 - type: Fixtures fixtures: {} - - uid: 13038 +- proto: DecorFloorBoard8 + entities: + - uid: 11165 components: - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,12.5 + pos: 32.5,-17.5 parent: 31 - type: Fixtures fixtures: {} -- proto: DecorFloorBoard8 - entities: - uid: 12677 components: - type: Transform @@ -30724,6 +30821,15 @@ entities: parent: 31 - type: Fixtures fixtures: {} +- proto: DecorFloorBookPile1 + entities: + - uid: 2651 + components: + - type: Transform + pos: -30.5,-29.5 + parent: 31 + - type: Fixtures + fixtures: {} - proto: DecorFloorBookPile3 entities: - uid: 12683 @@ -30777,8 +30883,23 @@ entities: parent: 31 - type: Fixtures fixtures: {} + - uid: 11109 + components: + - type: Transform + pos: 36.5,-19.5 + parent: 31 + - type: Fixtures + fixtures: {} - proto: DecorFloorCardboard entities: + - uid: 1588 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,13.5 + parent: 31 + - type: Fixtures + fixtures: {} - uid: 4499 components: - type: Transform @@ -30802,6 +30923,13 @@ entities: parent: 31 - type: Fixtures fixtures: {} + - uid: 9034 + components: + - type: Transform + pos: -34.5,12.5 + parent: 31 + - type: Fixtures + fixtures: {} - uid: 9866 components: - type: Transform @@ -30947,14 +31075,6 @@ entities: parent: 31 - type: Fixtures fixtures: {} - - uid: 13041 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,12.5 - parent: 31 - - type: Fixtures - fixtures: {} - uid: 13044 components: - type: Transform @@ -30988,16 +31108,6 @@ entities: parent: 31 - type: Fixtures fixtures: {} -- proto: DecorFloorGlass4 - entities: - - uid: 13037 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -37.5,15.5 - parent: 31 - - type: Fixtures - fixtures: {} - proto: DecorFloorGlass5 entities: - uid: 13027 @@ -31101,6 +31211,20 @@ entities: parent: 31 - type: Fixtures fixtures: {} + - uid: 9053 + components: + - type: Transform + pos: -29.5,19.5 + parent: 31 + - type: Fixtures + fixtures: {} + - uid: 9081 + components: + - type: Transform + pos: -28.5,18.5 + parent: 31 + - type: Fixtures + fixtures: {} - uid: 10170 components: - type: Transform @@ -31108,6 +31232,28 @@ entities: parent: 31 - type: Fixtures fixtures: {} + - uid: 10710 + components: + - type: Transform + pos: -38.5,18.5 + parent: 31 + - type: Fixtures + fixtures: {} + - uid: 10747 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -38.5,20.5 + parent: 31 + - type: Fixtures + fixtures: {} + - uid: 11401 + components: + - type: Transform + pos: 18.5,16.5 + parent: 31 + - type: Fixtures + fixtures: {} - uid: 11830 components: - type: Transform @@ -31177,14 +31323,6 @@ entities: parent: 31 - type: Fixtures fixtures: {} - - uid: 13033 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,13.5 - parent: 31 - - type: Fixtures - fixtures: {} - uid: 13035 components: - type: Transform @@ -31209,25 +31347,24 @@ entities: parent: 31 - type: Fixtures fixtures: {} - - uid: 12900 + - uid: 11365 components: - type: Transform - pos: 29.5,9.5 + pos: 29.5,-18.5 parent: 31 - type: Fixtures fixtures: {} - - uid: 12978 + - uid: 12900 components: - type: Transform - pos: 38.5,-0.5 + pos: 29.5,9.5 parent: 31 - type: Fixtures fixtures: {} - - uid: 13034 + - uid: 12978 components: - type: Transform - rot: 3.141592653589793 rad - pos: -38.5,12.5 + pos: 38.5,-0.5 parent: 31 - type: Fixtures fixtures: {} @@ -31248,21 +31385,35 @@ entities: parent: 31 - type: Fixtures fixtures: {} -- proto: DecorFloorPaper3 - entities: - - uid: 13028 + - uid: 8298 components: - type: Transform rot: 3.141592653589793 rad - pos: -23.5,17.5 + pos: -38.5,16.5 parent: 31 - type: Fixtures fixtures: {} - - uid: 13032 + - uid: 10755 + components: + - type: Transform + pos: -29.5,16.5 + parent: 31 + - type: Fixtures + fixtures: {} + - uid: 11185 + components: + - type: Transform + pos: 32.5,-19.5 + parent: 31 + - type: Fixtures + fixtures: {} +- proto: DecorFloorPaper3 + entities: + - uid: 13028 components: - type: Transform rot: 3.141592653589793 rad - pos: -36.5,15.5 + pos: -23.5,17.5 parent: 31 - type: Fixtures fixtures: {} @@ -31303,6 +31454,13 @@ entities: parent: 31 - type: NavMapBeacon text: evac +- proto: DefaultStationBeaconAI + entities: + - uid: 4485 + components: + - type: Transform + pos: 49.5,-26.5 + parent: 31 - proto: DefaultStationBeaconAME entities: - uid: 7280 @@ -31326,10 +31484,10 @@ entities: parent: 31 - proto: DefaultStationBeaconArrivals entities: - - uid: 812 + - uid: 11392 components: - type: Transform - pos: -44.5,-10.5 + pos: -37.5,18.5 parent: 31 - proto: DefaultStationBeaconArtifactLab entities: @@ -31352,6 +31510,13 @@ entities: - type: Transform pos: -5.5,-5.5 parent: 31 +- proto: DefaultStationBeaconBotany + entities: + - uid: 4535 + components: + - type: Transform + pos: -19.5,-0.5 + parent: 31 - proto: DefaultStationBeaconBridge entities: - uid: 11269 @@ -31424,10 +31589,10 @@ entities: parent: 31 - proto: DefaultStationBeaconCryosleep entities: - - uid: 9207 + - uid: 11393 components: - type: Transform - pos: -41.5,-4.5 + pos: -31.5,23.5 parent: 31 - proto: DefaultStationBeaconDisposals entities: @@ -31436,8 +31601,22 @@ entities: - type: Transform pos: -30.5,-16.5 parent: 31 +- proto: DefaultStationBeaconDorms + entities: + - uid: 4585 + components: + - type: Transform + pos: -30.5,-0.5 + parent: 31 - proto: DefaultStationBeaconEngineering entities: + - uid: 4637 + components: + - type: Transform + pos: -31.5,-32.5 + parent: 31 + - type: NavMapBeacon + text: Engineering Checkpoint - uid: 7281 components: - type: Transform @@ -31452,15 +31631,9 @@ entities: text: Tesla Storage - proto: DefaultStationBeaconEscapePod entities: - - uid: 5008 - components: - - type: Transform - pos: 49.5,-26.5 - parent: 31 - - uid: 11467 + - uid: 9199 components: - type: Transform - rot: 3.141592653589793 rad pos: 31.5,-17.5 parent: 31 - uid: 11468 @@ -31492,26 +31665,11 @@ entities: parent: 31 - proto: DefaultStationBeaconJanitorsCloset entities: - - uid: 6523 - components: - - type: Transform - pos: -19.5,-0.5 - parent: 31 - uid: 6586 components: - type: Transform pos: -21.5,-5.5 parent: 31 - - uid: 10816 - components: - - type: Transform - pos: -30.5,-0.5 - parent: 31 - - uid: 12640 - components: - - type: Transform - pos: -12.5,-12.5 - parent: 31 - proto: DefaultStationBeaconKitchen entities: - uid: 11318 @@ -31645,13 +31803,6 @@ entities: - type: Transform pos: 15.5,-29.5 parent: 31 - - uid: 11365 - components: - - type: Transform - pos: -31.5,-32.5 - parent: 31 - - type: NavMapBeacon - text: SW Engineering - uid: 11366 components: - type: Transform @@ -31678,6 +31829,13 @@ entities: - type: Transform pos: 50.5,-5.5 parent: 31 +- proto: DefaultStationBeaconTheater + entities: + - uid: 4634 + components: + - type: Transform + pos: -12.5,-12.5 + parent: 31 - proto: DefaultStationBeaconToolRoom entities: - uid: 11317 @@ -34459,13 +34617,6 @@ entities: - type: Transform pos: 22.658688,13.036925 parent: 31 -- proto: DrinkIcedTeaCan - entities: - - uid: 10759 - components: - - type: Transform - pos: -48.660885,-9.377042 - parent: 31 - proto: DrinkIcedTeaGlass entities: - uid: 9922 @@ -34481,13 +34632,6 @@ entities: - type: Transform pos: -2.680163,-1.1956873 parent: 31 -- proto: DrinkMeadGlass - entities: - - uid: 2952 - components: - - type: Transform - pos: -31.680155,17.680439 - parent: 31 - proto: DrinkMilkCarton entities: - uid: 2283 @@ -34514,8 +34658,11 @@ entities: - uid: 2749 components: - type: Transform - pos: -5.212646,14.755907 + pos: -5.2286186,13.898094 parent: 31 + - type: Physics + angularDamping: 0 + linearDamping: 0 - proto: DrinkMugMetal entities: - uid: 4205 @@ -34530,6 +34677,14 @@ entities: - type: Transform pos: -2.0580988,14.730206 parent: 31 + - uid: 10754 + components: + - type: Transform + pos: -33.420723,19.731 + parent: 31 + - type: Physics + angularDamping: 0 + linearDamping: 0 - proto: DrinkPoisonWinebottleFull entities: - uid: 12194 @@ -34687,6 +34842,11 @@ entities: - type: Transform pos: -17.805563,-6.218925 parent: 31 + - uid: 10752 + components: + - type: Transform + pos: -29.146284,19.671946 + parent: 31 - uid: 12195 components: - type: Transform @@ -34713,15 +34873,6 @@ entities: rot: 1.5707963267948966 rad pos: 48.5,-4.5 parent: 31 - - uid: 585 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,-3.5 - parent: 31 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 1187 components: - type: Transform @@ -34747,14 +34898,6 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight - - uid: 1299 - components: - - type: Transform - pos: -39.5,10.5 - parent: 31 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 1345 components: - type: Transform @@ -34800,6 +34943,24 @@ entities: - type: Transform pos: -9.5,-25.5 parent: 31 + - uid: 10761 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -38.5,22.5 + parent: 31 + - uid: 10767 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -27.5,-1.5 + parent: 31 + - uid: 11074 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,-27.5 + parent: 31 - uid: 13065 components: - type: Transform @@ -34966,21 +35127,11 @@ entities: - type: Transform pos: 14.5,-3.5 parent: 31 - - uid: 4895 - components: - - type: Transform - pos: -34.5,-10.5 - parent: 31 - uid: 4899 components: - type: Transform pos: -30.5,10.5 parent: 31 - - uid: 4900 - components: - - type: Transform - pos: -34.5,-2.5 - parent: 31 - uid: 4908 components: - type: Transform @@ -35111,6 +35262,13 @@ entities: parent: 31 - type: FaxMachine name: hop's office + - uid: 11405 + components: + - type: Transform + pos: -5.5,14.5 + parent: 31 + - type: FaxMachine + name: Security - proto: FaxMachineCaptain entities: - uid: 7191 @@ -35127,15 +35285,15 @@ entities: parent: 31 - proto: filingCabinetDrawerRandom entities: - - uid: 1758 + - uid: 1755 components: - type: Transform - pos: -1.5,11.5 + pos: -29.5,16.5 parent: 31 - - uid: 4637 + - uid: 1758 components: - type: Transform - pos: -10.5,-30.5 + pos: -1.5,11.5 parent: 31 - uid: 8890 components: @@ -35431,6 +35589,16 @@ entities: - type: Transform pos: 22.5,-22.5 parent: 31 + - uid: 2649 + components: + - type: Transform + pos: -29.5,14.5 + parent: 31 + - uid: 2650 + components: + - type: Transform + pos: -8.5,25.5 + parent: 31 - uid: 3376 components: - type: Transform @@ -35491,16 +35659,6 @@ entities: - type: Transform pos: 11.5,14.5 parent: 31 - - uid: 4041 - components: - - type: Transform - pos: -10.5,24.5 - parent: 31 - - uid: 4042 - components: - - type: Transform - pos: -10.5,25.5 - parent: 31 - uid: 4975 components: - type: Transform @@ -35526,22 +35684,35 @@ entities: - type: Transform pos: 6.5,20.5 parent: 31 - - uid: 5217 + - uid: 5312 components: - type: Transform - pos: -27.5,16.5 + pos: 15.5,-26.5 parent: 31 - - uid: 5312 + - uid: 6776 components: - type: Transform - pos: 15.5,-26.5 + pos: -29.5,13.5 + parent: 31 + - uid: 8849 + components: + - type: Transform + pos: -25.5,-29.5 parent: 31 + - type: DeviceNetwork + deviceLists: + - 8830 - uid: 10302 components: - type: Transform rot: 1.5707963267948966 rad pos: -28.5,-20.5 parent: 31 + - uid: 10435 + components: + - type: Transform + pos: -8.5,24.5 + parent: 31 - uid: 11101 components: - type: Transform @@ -35937,6 +36108,24 @@ entities: - type: DeviceNetwork deviceLists: - 9978 + - uid: 6153 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -37.5,11.5 + parent: 31 + - type: DeviceNetwork + deviceLists: + - 160 + - uid: 6154 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,11.5 + parent: 31 + - type: DeviceNetwork + deviceLists: + - 160 - uid: 6957 components: - type: Transform @@ -35965,12 +36154,6 @@ entities: - type: DeviceNetwork deviceLists: - 4101 - - uid: 7325 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,-8.5 - parent: 31 - uid: 7337 components: - type: Transform @@ -36064,6 +36247,15 @@ entities: - type: Transform pos: 1.5,5.5 parent: 31 + - uid: 9631 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -36.5,11.5 + parent: 31 + - type: DeviceNetwork + deviceLists: + - 160 - uid: 9782 components: - type: Transform @@ -36194,18 +36386,6 @@ entities: - type: Transform pos: 22.5,18.5 parent: 31 - - uid: 10245 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -36.5,-8.5 - parent: 31 - - uid: 10246 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,-8.5 - parent: 31 - uid: 10313 components: - type: Transform @@ -36722,13 +36902,6 @@ entities: - type: Transform pos: -19.338718,-10.132835 parent: 31 -- proto: FoodPizzaArnoldSlice - entities: - - uid: 9053 - components: - - type: Transform - pos: -29.477003,17.566315 - parent: 31 - proto: FoodPlateSmall entities: - uid: 6646 @@ -36945,6 +37118,18 @@ entities: parent: 31 - type: AtmosPipeColor color: '#990000FF' + - uid: 4956 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,22.5 + parent: 31 + - uid: 4960 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,23.5 + parent: 31 - uid: 6850 components: - type: Transform @@ -37015,7 +37200,7 @@ entities: pos: 33.5,16.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - proto: GasMinerAmmonia entities: - uid: 6657 @@ -37090,7 +37275,7 @@ entities: pos: 34.5,14.5 parent: 31 - type: AtmosPipeColor - color: '#234FDEFF' + color: '#1739A6FF' - uid: 8303 components: - type: Transform @@ -37283,6 +37468,18 @@ entities: rot: 1.5707963267948966 rad pos: 46.5,23.5 parent: 31 + - uid: 11394 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,23.5 + parent: 31 + - uid: 11395 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,22.5 + parent: 31 - uid: 12128 components: - type: Transform @@ -37329,6 +37526,22 @@ entities: - type: Transform pos: 45.5,23.5 parent: 31 + - uid: 732 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -37.5,23.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' + - uid: 812 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,22.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 898 components: - type: Transform @@ -37530,14 +37743,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 4642 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -40.5,-4.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 4649 components: - type: Transform @@ -38167,14 +38372,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 9200 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -37.5,0.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - uid: 9224 components: - type: Transform @@ -38189,7 +38386,7 @@ entities: pos: 33.5,12.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - uid: 9353 components: - type: Transform @@ -38569,14 +38766,14 @@ entities: pos: 32.5,12.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - uid: 12154 components: - type: Transform pos: 32.5,13.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - uid: 12248 components: - type: Transform @@ -38584,7 +38781,7 @@ entities: pos: 33.5,13.5 parent: 31 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#1739A6FF' - uid: 12250 components: - type: Transform @@ -38592,13 +38789,15 @@ entities: pos: 32.5,14.5 parent: 31 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#1739A6FF' - uid: 12580 components: - type: Transform rot: 3.141592653589793 rad pos: 31.5,13.5 parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - proto: GasPipeBroken entities: - uid: 1352 @@ -38678,13 +38877,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 6144 - components: - - type: Transform - pos: -35.5,5.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 6150 components: - type: Transform @@ -38713,13 +38905,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#00FF00FF' - - uid: 11407 - components: - - type: Transform - pos: -37.5,-5.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - uid: 11798 components: - type: Transform @@ -38823,12 +39008,57 @@ entities: - type: Transform pos: 45.5,22.5 parent: 31 + - uid: 487 + components: + - type: Transform + pos: -37.5,22.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' + - uid: 504 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,19.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' + - uid: 505 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,18.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' + - uid: 527 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,16.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' + - uid: 559 + components: + - type: Transform + pos: -35.5,19.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 561 components: - type: Transform rot: 3.141592653589793 rad pos: 35.5,20.5 parent: 31 + - uid: 585 + components: + - type: Transform + pos: -37.5,21.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 602 components: - type: Transform @@ -38837,6 +39067,13 @@ entities: parent: 31 - type: AtmosPipeColor color: '#990000FF' + - uid: 657 + components: + - type: Transform + pos: -35.5,17.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 660 components: - type: Transform @@ -38845,11 +39082,32 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 697 + components: + - type: Transform + pos: -37.5,20.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' + - uid: 710 + components: + - type: Transform + pos: -35.5,20.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 715 components: - type: Transform pos: 37.5,19.5 parent: 31 + - uid: 717 + components: + - type: Transform + pos: -35.5,21.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 750 components: - type: Transform @@ -38916,6 +39174,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 891 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,23.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 899 components: - type: Transform @@ -38939,6 +39205,22 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 932 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,23.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' + - uid: 975 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,23.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 978 components: - type: Transform @@ -39023,6 +39305,22 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 1299 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,16.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' + - uid: 1309 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,16.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 1320 components: - type: Transform @@ -39165,6 +39463,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 1757 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,14.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 1773 components: - type: Transform @@ -39234,6 +39540,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 2011 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,15.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 2206 components: - type: Transform @@ -39308,6 +39622,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 2712 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-21.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 2741 components: - type: Transform @@ -39503,25 +39825,26 @@ entities: - type: Transform pos: -32.5,-8.5 parent: 31 - - uid: 3827 + - uid: 3804 components: - type: Transform - pos: 51.5,22.5 + pos: 18.5,-20.5 parent: 31 - type: AtmosPipeColor - color: '#ADD8E6FF' - - uid: 3873 + color: '#A01E16FF' + - uid: 3806 components: - type: Transform - pos: 35.5,18.5 + rot: 3.141592653589793 rad + pos: 19.5,-19.5 parent: 31 - - uid: 3888 + - type: AtmosPipeColor + color: '#1739A6FF' + - uid: 3873 components: - type: Transform - pos: 51.5,23.5 + pos: 35.5,18.5 parent: 31 - - type: AtmosPipeColor - color: '#ADD8E6FF' - uid: 3922 components: - type: Transform @@ -39817,20 +40140,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#990000FF' - - uid: 4485 - components: - - type: Transform - pos: -37.5,-8.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 4535 - components: - - type: Transform - pos: -37.5,-9.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - uid: 4548 components: - type: Transform @@ -39977,6 +40286,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 4826 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,19.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 4833 components: - type: Transform @@ -40014,6 +40331,22 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 4896 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,23.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' + - uid: 4905 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,23.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 4949 components: - type: Transform @@ -40064,6 +40397,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 5008 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,22.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 5012 components: - type: Transform @@ -40098,6 +40439,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#990000FF' + - uid: 5041 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,22.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 5044 components: - type: Transform @@ -40146,13 +40495,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 5123 - components: - - type: Transform - pos: -37.5,-10.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - uid: 5126 components: - type: Transform @@ -41701,6 +42043,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 5609 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,14.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 5612 components: - type: Transform @@ -42150,6 +42500,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 5773 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,22.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 5774 components: - type: Transform @@ -43242,6 +43600,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 5978 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,15.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 5984 components: - type: Transform @@ -43920,84 +44286,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 6153 - components: - - type: Transform - pos: -35.5,4.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6154 - components: - - type: Transform - pos: -35.5,3.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6155 - components: - - type: Transform - pos: -35.5,2.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6156 - components: - - type: Transform - pos: -35.5,1.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6157 - components: - - type: Transform - pos: -35.5,0.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6158 - components: - - type: Transform - pos: -35.5,-0.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6159 - components: - - type: Transform - pos: -35.5,-1.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6160 - components: - - type: Transform - pos: -35.5,-2.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6161 - components: - - type: Transform - pos: -35.5,-3.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 6162 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -39.5,-5.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 6163 - components: - - type: Transform - pos: -35.5,-5.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 6164 components: - type: Transform @@ -44883,6 +45171,13 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 6993 + components: + - type: Transform + pos: -35.5,18.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 7029 components: - type: Transform @@ -45039,6 +45334,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 7220 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,19.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 7227 components: - type: Transform @@ -45146,7 +45449,7 @@ entities: pos: 32.5,16.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - uid: 7557 components: - type: Transform @@ -45154,6 +45457,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 7675 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,17.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 7693 components: - type: Transform @@ -45368,6 +45679,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 8027 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,16.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 8049 components: - type: Transform @@ -45376,6 +45695,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#990000FF' + - uid: 8051 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,19.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 8089 components: - type: Transform @@ -45383,6 +45710,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8204 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,19.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 8210 components: - type: Transform @@ -45398,6 +45733,29 @@ entities: parent: 31 - type: AtmosPipeColor color: '#990000FF' + - uid: 8222 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-20.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' + - uid: 8239 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-18.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' + - uid: 8250 + components: + - type: Transform + pos: 18.5,-19.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 8253 components: - type: Transform @@ -45827,38 +46185,10 @@ entities: parent: 31 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 9176 - components: - - type: Transform - pos: -37.5,-0.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 9177 - components: - - type: Transform - pos: -37.5,-2.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 9178 - components: - - type: Transform - pos: -37.5,-3.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 9199 - components: - - type: Transform - pos: -37.5,-1.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 9201 + - uid: 9173 components: - type: Transform - pos: -37.5,-4.5 + pos: -36.5,0.5 parent: 31 - type: AtmosPipeColor color: '#A01E16FF' @@ -46114,34 +46444,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 10247 - components: - - type: Transform - pos: -37.5,-7.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 10248 - components: - - type: Transform - pos: -37.5,-6.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 10249 - components: - - type: Transform - pos: -35.5,-7.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 10250 - components: - - type: Transform - pos: -35.5,-8.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 10378 components: - type: Transform @@ -47041,46 +47343,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#234FDEFF' - - uid: 11401 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -38.5,-5.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - - uid: 11402 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -36.5,-4.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 11403 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -37.5,-4.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 11404 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -38.5,-4.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - - uid: 11405 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -39.5,-4.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 11418 components: - type: Transform @@ -47817,7 +48079,7 @@ entities: pos: 34.5,12.5 parent: 31 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#1739A6FF' - uid: 12150 components: - type: Transform @@ -47825,7 +48087,7 @@ entities: pos: 31.5,15.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - uid: 12151 components: - type: Transform @@ -47833,7 +48095,7 @@ entities: pos: 31.5,14.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - uid: 12541 components: - type: Transform @@ -48224,6 +48486,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 5270 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-18.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 5342 components: - type: Transform @@ -48530,6 +48800,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 5719 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-17.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 5801 components: - type: Transform @@ -48929,14 +49207,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 7504 + - uid: 7473 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -36.5,0.5 + rot: 1.5707963267948966 rad + pos: -35.5,16.5 parent: 31 - type: AtmosPipeColor - color: '#A01E16FF' + color: '#1739A6FF' - uid: 7547 components: - type: Transform @@ -49013,6 +49291,22 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 9194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,5.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' + - uid: 9889 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -37.5,19.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 10041 components: - type: Transform @@ -49037,14 +49331,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 10251 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,-6.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 10414 components: - type: Transform @@ -49052,7 +49338,7 @@ entities: pos: 31.5,16.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - uid: 10415 components: - type: Transform @@ -49149,14 +49435,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 11406 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,-4.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 11574 components: - type: Transform @@ -49294,7 +49572,7 @@ entities: pos: 34.5,13.5 parent: 31 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#1739A6FF' - uid: 12249 components: - type: Transform @@ -49302,7 +49580,7 @@ entities: pos: 33.5,14.5 parent: 31 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#1739A6FF' - proto: GasPort entities: - uid: 188 @@ -49382,6 +49660,8 @@ entities: rot: 3.141592653589793 rad pos: 31.5,13.5 parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 12553 components: - type: Transform @@ -49598,7 +49878,7 @@ entities: pos: 31.5,17.5 parent: 31 - type: AtmosPipeColor - color: '#990000FF' + color: '#A01E16FF' - uid: 11149 components: - type: MetaData @@ -49701,7 +49981,7 @@ entities: pos: 32.5,15.5 parent: 31 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#1739A6FF' - proto: GasThermoMachineFreezerEnabled entities: - uid: 3850 @@ -49725,7 +50005,7 @@ entities: pos: 33.5,15.5 parent: 31 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#1739A6FF' - proto: GasValve entities: - uid: 8455 @@ -49770,6 +50050,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 466 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,16.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 1094 components: - type: Transform @@ -49809,26 +50097,26 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 3116 + - uid: 2685 components: - type: Transform rot: -1.5707963267948966 rad - pos: 26.5,9.5 + pos: 20.5,-17.5 parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 3368 + - uid: 3116 components: - type: Transform - pos: -5.5,16.5 + rot: -1.5707963267948966 rad + pos: 26.5,9.5 parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 3835 + - uid: 3368 components: - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-17.5 + pos: -5.5,16.5 parent: 31 - type: AtmosPipeColor color: '#1739A6FF' @@ -49879,14 +50167,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 4484 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -35.5,-9.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 4584 components: - type: Transform @@ -49910,6 +50190,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 5216 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,22.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 5365 components: - type: Transform @@ -50111,14 +50399,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 6169 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -36.5,-6.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 6184 components: - type: Transform @@ -50194,6 +50474,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' + - uid: 6652 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-21.5 + parent: 31 + - type: AtmosPipeColor + color: '#1739A6FF' - uid: 6697 components: - type: Transform @@ -50279,13 +50567,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 7746 - components: - - type: Transform - pos: -35.5,14.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 8417 components: - type: Transform @@ -50405,13 +50686,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#1739A6FF' - - uid: 11399 - components: - - type: Transform - pos: -40.5,-3.5 - parent: 31 - - type: AtmosPipeColor - color: '#1739A6FF' - uid: 11448 components: - type: Transform @@ -50487,6 +50761,17 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 465 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,19.5 + parent: 31 + - type: DeviceNetwork + deviceLists: + - 160 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 475 components: - type: Transform @@ -50578,6 +50863,9 @@ entities: - type: Transform pos: -38.5,18.5 parent: 31 + - type: DeviceNetwork + deviceLists: + - 160 - type: AtmosPipeColor color: '#A01E16FF' - uid: 2268 @@ -50613,14 +50901,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 3840 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-18.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - uid: 3939 components: - type: Transform @@ -50664,14 +50944,6 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 4486 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -37.5,-11.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - uid: 4701 components: - type: Transform @@ -50759,6 +51031,17 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 5537 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,23.5 + parent: 31 + - type: DeviceNetwork + deviceLists: + - 160 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 5541 components: - type: Transform @@ -50837,10 +51120,9 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 6024 + - uid: 5977 components: - type: Transform - anchored: False rot: 1.5707963267948966 rad pos: -12.5,14.5 parent: 31 @@ -50848,10 +51130,7 @@ entities: deviceLists: - 9998 - type: AtmosPipeColor - color: '#990000FF' - - type: Physics - canCollide: True - bodyType: Dynamic + color: '#A01E16FF' - uid: 6032 components: - type: Transform @@ -51029,6 +51308,14 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' + - uid: 6780 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-22.5 + parent: 31 + - type: AtmosPipeColor + color: '#A01E16FF' - uid: 6961 components: - type: Transform @@ -51059,18 +51346,19 @@ entities: parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 7673 + - uid: 7264 components: - type: Transform rot: 1.5707963267948966 rad - pos: 7.5,-13.5 + pos: 17.5,-18.5 parent: 31 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 7745 + - uid: 7673 components: - type: Transform - pos: -37.5,14.5 + rot: 1.5707963267948966 rad + pos: 7.5,-13.5 parent: 31 - type: AtmosPipeColor color: '#A01E16FF' @@ -51189,14 +51477,6 @@ entities: - 10238 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 10252 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -36.5,-5.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - uid: 10375 components: - type: Transform @@ -51291,14 +51571,6 @@ entities: - 9042 - type: AtmosPipeColor color: '#A01E16FF' - - uid: 11400 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -40.5,-5.5 - parent: 31 - - type: AtmosPipeColor - color: '#A01E16FF' - uid: 11569 components: - type: Transform @@ -51525,9 +51797,6 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-30.5 parent: 31 - - type: Geiger - isEnabled: True - - type: RadiationReceiver - proto: GeneratorBasic15kW entities: - uid: 8506 @@ -51614,26 +51883,11 @@ entities: - type: Transform pos: 5.5,-5.5 parent: 31 - - uid: 101 - components: - - type: Transform - pos: -48.5,-12.5 - parent: 31 - - uid: 138 - components: - - type: Transform - pos: -49.5,-12.5 - parent: 31 - uid: 255 components: - type: Transform pos: 11.5,-6.5 parent: 31 - - uid: 267 - components: - - type: Transform - pos: -50.5,-8.5 - parent: 31 - uid: 338 components: - type: Transform @@ -51649,10 +51903,15 @@ entities: - type: Transform pos: -23.5,26.5 parent: 31 - - uid: 469 + - uid: 471 components: - type: Transform - pos: -35.5,11.5 + pos: -37.5,26.5 + parent: 31 + - uid: 482 + components: + - type: Transform + pos: -35.5,26.5 parent: 31 - uid: 532 components: @@ -51675,11 +51934,6 @@ entities: - type: Transform pos: 39.5,26.5 parent: 31 - - uid: 657 - components: - - type: Transform - pos: -37.5,11.5 - parent: 31 - uid: 665 components: - type: Transform @@ -51772,6 +52026,12 @@ entities: - type: Transform pos: 44.5,20.5 parent: 31 + - uid: 1129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -39.5,15.5 + parent: 31 - uid: 1131 components: - type: Transform @@ -52004,11 +52264,6 @@ entities: - type: Transform pos: 1.5,-33.5 parent: 31 - - uid: 1757 - components: - - type: Transform - pos: -49.5,-8.5 - parent: 31 - uid: 1759 components: - type: Transform @@ -52364,6 +52619,16 @@ entities: - type: Transform pos: 58.5,3.5 parent: 31 + - uid: 4864 + components: + - type: Transform + pos: -36.5,-2.5 + parent: 31 + - uid: 4871 + components: + - type: Transform + pos: -39.5,-2.5 + parent: 31 - uid: 4879 components: - type: Transform @@ -52374,6 +52639,17 @@ entities: - type: Transform pos: -0.5,6.5 parent: 31 + - uid: 5053 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,-8.5 + parent: 31 + - uid: 5054 + components: + - type: Transform + pos: -38.5,-2.5 + parent: 31 - uid: 5071 components: - type: Transform @@ -52399,20 +52675,27 @@ entities: - type: Transform pos: -3.5,7.5 parent: 31 - - uid: 5139 + - uid: 5123 components: - type: Transform - pos: 8.5,-11.5 + rot: -1.5707963267948966 rad + pos: -34.5,-6.5 parent: 31 - - uid: 5198 + - uid: 5131 components: - type: Transform - pos: -28.5,18.5 + rot: -1.5707963267948966 rad + pos: -34.5,-4.5 parent: 31 - - uid: 5199 + - uid: 5139 + components: + - type: Transform + pos: 8.5,-11.5 + parent: 31 + - uid: 5159 components: - type: Transform - pos: -29.5,18.5 + pos: -37.5,-2.5 parent: 31 - uid: 5215 components: @@ -52428,7 +52711,8 @@ entities: - uid: 5244 components: - type: Transform - pos: -39.5,21.5 + rot: -1.5707963267948966 rad + pos: -34.5,-10.5 parent: 31 - uid: 5251 components: @@ -52445,11 +52729,6 @@ entities: - type: Transform pos: -41.5,7.5 parent: 31 - - uid: 5978 - components: - - type: Transform - pos: -54.5,-9.5 - parent: 31 - uid: 6287 components: - type: Transform @@ -52633,11 +52912,6 @@ entities: - type: Transform pos: 36.5,18.5 parent: 31 - - uid: 6641 - components: - - type: Transform - pos: -41.5,-8.5 - parent: 31 - uid: 6645 components: - type: Transform @@ -52911,12 +53185,6 @@ entities: - type: Transform pos: 1.5,-34.5 parent: 31 - - uid: 7358 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,15.5 - parent: 31 - uid: 7375 components: - type: Transform @@ -52969,11 +53237,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-32.5 parent: 31 - - uid: 7472 - components: - - type: Transform - pos: -31.5,19.5 - parent: 31 - uid: 7485 components: - type: Transform @@ -52984,22 +53247,12 @@ entities: - type: Transform pos: 61.5,-7.5 parent: 31 - - uid: 7632 - components: - - type: Transform - pos: -39.5,19.5 - parent: 31 - uid: 7634 components: - type: Transform rot: 1.5707963267948966 rad pos: 60.5,-22.5 parent: 31 - - uid: 7636 - components: - - type: Transform - pos: -47.5,-12.5 - parent: 31 - uid: 7648 components: - type: Transform @@ -53048,22 +53301,12 @@ entities: - type: Transform pos: -39.5,12.5 parent: 31 - - uid: 7697 - components: - - type: Transform - pos: -46.5,-12.5 - parent: 31 - uid: 7709 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,35.5 parent: 31 - - uid: 7713 - components: - - type: Transform - pos: -54.5,-10.5 - parent: 31 - uid: 7748 components: - type: Transform @@ -53090,11 +53333,6 @@ entities: - type: Transform pos: -5.5,-33.5 parent: 31 - - uid: 7830 - components: - - type: Transform - pos: -42.5,-8.5 - parent: 31 - uid: 7838 components: - type: Transform @@ -53139,11 +53377,6 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,-29.5 parent: 31 - - uid: 7947 - components: - - type: Transform - pos: -40.5,-8.5 - parent: 31 - uid: 8048 components: - type: Transform @@ -53216,10 +53449,10 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-31.5 parent: 31 - - uid: 8222 + - uid: 8212 components: - type: Transform - pos: -32.5,19.5 + pos: -35.5,-2.5 parent: 31 - uid: 8306 components: @@ -53441,11 +53674,6 @@ entities: rot: -1.5707963267948966 rad pos: 74.5,14.5 parent: 31 - - uid: 9174 - components: - - type: Transform - pos: -37.5,-12.5 - parent: 31 - uid: 9175 components: - type: Transform @@ -53457,15 +53685,17 @@ entities: rot: -1.5707963267948966 rad pos: -21.5,4.5 parent: 31 - - uid: 9208 + - uid: 9213 components: - type: Transform - pos: -36.5,-12.5 + rot: -1.5707963267948966 rad + pos: -33.5,24.5 parent: 31 - - uid: 9209 + - uid: 9214 components: - type: Transform - pos: -35.5,-12.5 + rot: -1.5707963267948966 rad + pos: -33.5,21.5 parent: 31 - uid: 9231 components: @@ -53810,22 +54040,17 @@ entities: - type: Transform pos: -22.5,-35.5 parent: 31 - - uid: 9838 - components: - - type: Transform - pos: -39.5,14.5 - parent: 31 - uid: 9862 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,33.5 parent: 31 - - uid: 9889 + - uid: 9892 components: - type: Transform rot: -1.5707963267948966 rad - pos: -42.5,13.5 + pos: -40.5,25.5 parent: 31 - uid: 9899 components: @@ -53833,6 +54058,12 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,36.5 parent: 31 + - uid: 9906 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -40.5,16.5 + parent: 31 - uid: 9949 components: - type: Transform @@ -53925,17 +54156,6 @@ entities: rot: 3.141592653589793 rad pos: -8.5,37.5 parent: 31 - - uid: 10372 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,14.5 - parent: 31 - - uid: 10438 - components: - - type: Transform - pos: -39.5,18.5 - parent: 31 - uid: 10520 components: - type: Transform @@ -53951,26 +54171,6 @@ entities: - type: Transform pos: -44.5,7.5 parent: 31 - - uid: 10747 - components: - - type: Transform - pos: -46.5,-8.5 - parent: 31 - - uid: 10748 - components: - - type: Transform - pos: -47.5,-8.5 - parent: 31 - - uid: 10749 - components: - - type: Transform - pos: -48.5,-8.5 - parent: 31 - - uid: 10751 - components: - - type: Transform - pos: -45.5,-8.5 - parent: 31 - uid: 11071 components: - type: Transform @@ -54086,24 +54286,6 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-19.5 parent: 31 - - uid: 11408 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -43.5,-4.5 - parent: 31 - - uid: 11409 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,-2.5 - parent: 31 - - uid: 11410 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,-6.5 - parent: 31 - uid: 11480 components: - type: Transform @@ -54735,18 +54917,6 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,28.5 parent: 31 - - uid: 80 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -40.5,20.5 - parent: 31 - - uid: 552 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -42.5,12.5 - parent: 31 - uid: 4444 components: - type: Transform @@ -54932,12 +55102,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-34.5 parent: 31 - - uid: 9854 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-46.5 - parent: 31 - uid: 9855 components: - type: Transform @@ -55113,11 +55277,14 @@ entities: parent: 31 - proto: HandheldHealthAnalyzerUnpowered entities: - - uid: 10030 + - uid: 4042 components: - type: Transform - pos: 17.362448,-18.309433 + pos: 17.395746,-20.54794 parent: 31 + - type: Physics + angularDamping: 0 + linearDamping: 0 - proto: HandheldStationMap entities: - uid: 5924 @@ -55142,6 +55309,11 @@ entities: - type: Transform pos: 8.041532,18.530302 parent: 31 + - uid: 10436 + components: + - type: Transform + pos: -38.455948,21.639866 + parent: 31 - proto: HarmonicaInstrument entities: - uid: 7248 @@ -55387,13 +55559,6 @@ entities: - type: Transform pos: -19.031883,8.817266 parent: 31 -- proto: HydroponicsToolHatchet - entities: - - uid: 90 - components: - - type: Transform - pos: 17.345112,-20.624432 - parent: 31 - proto: HydroponicsToolMiniHoe entities: - uid: 5633 @@ -55571,12 +55736,6 @@ entities: parent: 31 - proto: IntercomCommon entities: - - uid: 9906 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -34.5,-8.5 - parent: 31 - uid: 9907 components: - type: Transform @@ -56066,11 +56225,6 @@ entities: parent: 31 - proto: Lantern entities: - - uid: 2951 - components: - - type: Transform - pos: -31.237429,17.709938 - parent: 31 - uid: 9761 components: - type: Transform @@ -56466,6 +56620,24 @@ entities: - type: Transform pos: -13.5,-27.5 parent: 31 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 4459 components: - type: Transform @@ -56478,6 +56650,11 @@ entities: parent: 31 - proto: LockerSecurityFilled entities: + - uid: 99 + components: + - type: Transform + pos: -30.5,19.5 + parent: 31 - uid: 804 components: - type: Transform @@ -56549,11 +56726,6 @@ entities: - type: Transform pos: -30.684525,-9.548513 parent: 31 - - uid: 12679 - components: - - type: Transform - pos: -30.496725,-29.480463 - parent: 31 - proto: LunchboxGenericFilledRandom entities: - uid: 2908 @@ -56620,6 +56792,13 @@ entities: - type: Transform pos: -3.5,-43.5 parent: 31 +- proto: MailTeleporter + entities: + - uid: 4208 + components: + - type: Transform + pos: 18.5,15.5 + parent: 31 - proto: MaintenanceFluffSpawner entities: - uid: 4504 @@ -56691,6 +56870,11 @@ entities: - type: Transform pos: -32.5,-15.5 parent: 31 + - uid: 7325 + components: + - type: Transform + pos: -34.5,12.5 + parent: 31 - uid: 7409 components: - type: Transform @@ -56774,10 +56958,10 @@ entities: parent: 31 - proto: MaterialBiomass entities: - - uid: 11682 + - uid: 10776 components: - type: Transform - pos: 22.199543,-9.727578 + pos: 20.512403,-15.252709 parent: 31 - type: Physics angularDamping: 0 @@ -56801,13 +56985,6 @@ entities: - type: Transform pos: 11.604966,-40.553932 parent: 31 -- proto: MaterialCloth10 - entities: - - uid: 2130 - components: - - type: Transform - pos: 17.323816,-21.401403 - parent: 31 - proto: MaterialDiamond entities: - uid: 9628 @@ -56871,10 +57048,10 @@ entities: parent: 31 - proto: MedicalScanner entities: - - uid: 11687 + - uid: 8031 components: - type: Transform - pos: 10.5,-15.5 + pos: 17.5,-16.5 parent: 31 - proto: MedicalTechFab entities: @@ -56937,6 +57114,11 @@ entities: - type: Transform pos: 12.428257,-5.4459076 parent: 31 + - uid: 4484 + components: + - type: Transform + pos: -34.3035,13.592627 + parent: 31 - uid: 7782 components: - type: Transform @@ -56944,6 +57126,11 @@ entities: parent: 31 - proto: MedkitRadiationFilled entities: + - uid: 10775 + components: + - type: Transform + pos: 19.706501,-18.29206 + parent: 31 - uid: 10809 components: - type: Transform @@ -56963,10 +57150,10 @@ entities: parent: 31 - proto: MetempsychoticMachine entities: - - uid: 11685 + - uid: 6773 components: - type: Transform - pos: 10.5,-17.5 + pos: 17.5,-17.5 parent: 31 - proto: MicrophoneInstrument entities: @@ -57064,10 +57251,10 @@ entities: parent: 31 - proto: NetworkConfigurator entities: - - uid: 10995 + - uid: 10773 components: - type: Transform - pos: 8.333701,-17.377625 + pos: 20.285225,-15.3171 parent: 31 - proto: NitrogenCanister entities: @@ -57081,15 +57268,15 @@ entities: - type: Transform pos: -3.5,-8.5 parent: 31 - - uid: 7282 + - uid: 4895 components: - type: Transform - pos: 52.5,5.5 + pos: -31.5,12.5 parent: 31 - - uid: 7780 + - uid: 7282 components: - type: Transform - pos: -29.5,13.5 + pos: 52.5,5.5 parent: 31 - uid: 7983 components: @@ -57147,11 +57334,22 @@ entities: parent: 31 - proto: NitrousOxideTankFilled entities: - - uid: 10028 + - uid: 3914 components: - type: Transform - pos: 18.18887,-18.427427 + pos: 17.718664,-21.017015 parent: 31 + - type: GasTank + toggleActionEntity: 3935 + - type: Physics + angularDamping: 0 + linearDamping: 0 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 3935 - proto: NuclearBomb entities: - uid: 4217 @@ -57203,6 +57401,12 @@ entities: rot: -1.5707963267948966 rad pos: 12.601061,-4.88571 parent: 31 + - uid: 6771 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.281129,-17.576036 + parent: 31 - proto: OnionSeeds entities: - uid: 9678 @@ -57213,10 +57417,10 @@ entities: parent: 31 - proto: OperatingTable entities: - - uid: 4915 + - uid: 4876 components: - type: Transform - pos: 20.5,-16.5 + pos: 19.5,-22.5 parent: 31 - proto: OracleSpawner entities: @@ -57245,6 +57449,11 @@ entities: - type: Transform pos: -4.5,-8.5 parent: 31 + - uid: 1695 + components: + - type: Transform + pos: -31.5,11.5 + parent: 31 - uid: 1738 components: - type: Transform @@ -57280,10 +57489,10 @@ entities: - type: Transform pos: 14.5,-31.5 parent: 31 - - uid: 7781 + - uid: 8025 components: - type: Transform - pos: -28.5,13.5 + pos: 10.5,-17.5 parent: 31 - uid: 9448 components: @@ -57447,6 +57656,12 @@ entities: parent: 31 - proto: PaperBin20 entities: + - uid: 90 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -28.5,19.5 + parent: 31 - uid: 11693 components: - type: Transform @@ -57600,6 +57815,11 @@ entities: - type: Transform pos: -14.565138,-39.497578 parent: 31 + - uid: 10764 + components: + - type: Transform + pos: -28.476103,18.905796 + parent: 31 - uid: 11042 components: - type: Transform @@ -57784,17 +58004,19 @@ entities: - type: Transform pos: 44.47201,25.696434 parent: 31 -- proto: PlushieLizard +- proto: PlushieCatBlack entities: - - uid: 1058 + - uid: 9629 components: - type: Transform - pos: -36.50589,-29.473022 + pos: 19.512806,-22.556679 parent: 31 - - uid: 1125 +- proto: PlushieLizard + entities: + - uid: 1058 components: - type: Transform - pos: -31.457468,18.461973 + pos: -36.50589,-29.473022 parent: 31 - uid: 10650 components: @@ -57806,13 +58028,6 @@ entities: - type: Transform pos: 6.8823633,-3.4168224 parent: 31 -- proto: PlushieSpaceLizard - entities: - - uid: 13054 - components: - - type: Transform - pos: -40.496353,-9.50457 - parent: 31 - proto: PonderingOrb entities: - uid: 7097 @@ -58070,12 +58285,6 @@ entities: parent: 31 - proto: PosterLegitNanotrasenLogo entities: - - uid: 2566 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -43.5,-8.5 - parent: 31 - uid: 2691 components: - type: Transform @@ -58182,11 +58391,6 @@ entities: - type: Transform pos: -39.5,-0.5 parent: 31 - - uid: 9479 - components: - - type: Transform - pos: -38.5,-6.5 - parent: 31 - uid: 9579 components: - type: Transform @@ -58239,10 +58443,20 @@ entities: - type: Transform pos: -7.5,36.5 parent: 31 - - uid: 2712 + - uid: 5211 components: - type: Transform - pos: -35.5,-11.5 + pos: -38.5,25.5 + parent: 31 + - uid: 5220 + components: + - type: Transform + pos: -32.5,17.5 + parent: 31 + - uid: 5266 + components: + - type: Transform + pos: -28.5,16.5 parent: 31 - uid: 5634 components: @@ -58280,10 +58494,10 @@ entities: - type: Transform pos: 2.5,23.5 parent: 31 - - uid: 9915 + - uid: 10583 components: - type: Transform - pos: -43.5,-9.5 + pos: -38.5,12.5 parent: 31 - uid: 11004 components: @@ -58317,6 +58531,11 @@ entities: - type: Transform pos: -11.5,-20.5 parent: 31 + - uid: 6772 + components: + - type: Transform + pos: 10.5,-17.5 + parent: 31 - uid: 9040 components: - type: Transform @@ -58412,6 +58631,11 @@ entities: - type: Transform pos: 34.5,0.5 parent: 31 + - uid: 10753 + components: + - type: Transform + pos: -33.5,18.5 + parent: 31 - uid: 10989 components: - type: Transform @@ -58458,6 +58682,11 @@ entities: - type: Transform pos: 46.5,-16.5 parent: 31 + - uid: 6612 + components: + - type: Transform + pos: -27.5,22.5 + parent: 31 - uid: 7214 components: - type: Transform @@ -58482,6 +58711,11 @@ entities: rot: 3.141592653589793 rad pos: -9.5,32.5 parent: 31 + - uid: 8854 + components: + - type: Transform + pos: -29.5,29.5 + parent: 31 - uid: 8953 components: - type: Transform @@ -58571,14 +58805,6 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 - - uid: 891 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,-4.5 - parent: 31 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 892 components: - type: Transform @@ -58717,6 +58943,12 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 + - uid: 1295 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,17.5 + parent: 31 - uid: 1301 components: - type: Transform @@ -58804,6 +59036,11 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 + - uid: 1587 + components: + - type: Transform + pos: -32.5,19.5 + parent: 31 - uid: 1605 components: - type: Transform @@ -58902,6 +59139,12 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,-29.5 parent: 31 + - uid: 3835 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-20.5 + parent: 31 - uid: 3842 components: - type: Transform @@ -58913,6 +59156,12 @@ entities: - type: Transform pos: 46.5,-21.5 parent: 31 + - uid: 3902 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-15.5 + parent: 31 - uid: 3908 components: - type: Transform @@ -58987,6 +59236,17 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 + - uid: 5230 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -38.5,12.5 + parent: 31 + - uid: 5983 + components: + - type: Transform + pos: -36.5,25.5 + parent: 31 - uid: 6182 components: - type: Transform @@ -59031,6 +59291,12 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 + - uid: 6781 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-22.5 + parent: 31 - uid: 6860 components: - type: Transform @@ -59132,12 +59398,6 @@ entities: - type: Transform pos: 14.5,-13.5 parent: 31 - - uid: 7350 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-18.5 - parent: 31 - uid: 7384 components: - type: Transform @@ -59174,18 +59434,6 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 - - uid: 7785 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -50.5,-11.5 - parent: 31 - - uid: 7788 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -45.5,-11.5 - parent: 31 - uid: 8231 components: - type: Transform @@ -59288,14 +59536,12 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 - - uid: 9330 + - uid: 9184 components: - type: Transform rot: -1.5707963267948966 rad - pos: -35.5,-9.5 + pos: -28.5,16.5 parent: 31 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 10301 components: - type: Transform @@ -59308,11 +59554,11 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-31.5 parent: 31 - - uid: 10767 + - uid: 10779 components: - type: Transform - rot: 3.141592653589793 rad - pos: -39.5,-11.5 + rot: 1.5707963267948966 rad + pos: 17.5,-18.5 parent: 31 - uid: 10879 components: @@ -59361,11 +59607,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-29.5 parent: 31 - - uid: 11414 - components: - - type: Transform - pos: -41.5,-3.5 - parent: 31 - uid: 11543 components: - type: Transform @@ -59461,6 +59702,17 @@ entities: - 10155 - proto: PoweredSmallLight entities: + - uid: 468 + components: + - type: Transform + pos: -40.5,17.5 + parent: 31 + - uid: 470 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,24.5 + parent: 31 - uid: 1246 components: - type: Transform @@ -59666,12 +59918,6 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 - - uid: 4906 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,-19.5 - parent: 31 - uid: 4959 components: - type: Transform @@ -59695,6 +59941,18 @@ entities: parent: 31 - type: ApcPowerReceiver powerLoad: 0 + - uid: 5217 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -40.5,24.5 + parent: 31 + - uid: 5233 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,21.5 + parent: 31 - uid: 5550 components: - type: Transform @@ -60297,6 +60555,12 @@ entities: - type: Transform pos: 41.5,-13.5 parent: 31 + - uid: 10772 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-15.5 + parent: 31 - uid: 10978 components: - type: Transform @@ -60419,12 +60683,28 @@ entities: parent: 31 - proto: Railing entities: + - uid: 1088 + components: + - type: Transform + pos: -35.5,27.5 + parent: 31 + - uid: 1091 + components: + - type: Transform + pos: -37.5,27.5 + parent: 31 - uid: 2118 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,30.5 parent: 31 + - uid: 2155 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,15.5 + parent: 31 - uid: 2192 components: - type: Transform @@ -60442,32 +60722,192 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,-11.5 parent: 31 + - uid: 3050 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,-13.5 + parent: 31 + - uid: 3053 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-13.5 + parent: 31 + - uid: 3743 + components: + - type: Transform + pos: 60.5,12.5 + parent: 31 - uid: 3796 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-10.5 parent: 31 + - uid: 4195 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-29.5 + parent: 31 + - uid: 4642 + components: + - type: Transform + pos: 59.5,12.5 + parent: 31 + - uid: 4872 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-30.5 + parent: 31 - uid: 5314 components: - type: Transform pos: -15.5,27.5 parent: 31 + - uid: 6144 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-45.5 + parent: 31 + - uid: 6159 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-46.5 + parent: 31 + - uid: 6160 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-10.5 + parent: 31 + - uid: 6442 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-15.5 + parent: 31 - uid: 6452 components: - type: Transform pos: -20.5,27.5 parent: 31 + - uid: 6469 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-25.5 + parent: 31 + - uid: 6523 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-4.5 + parent: 31 + - uid: 6567 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-6.5 + parent: 31 + - uid: 6576 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-8.5 + parent: 31 + - uid: 6840 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,-13.5 + parent: 31 - uid: 6977 components: - type: Transform pos: 46.5,-26.5 parent: 31 + - uid: 7618 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-23.5 + parent: 31 + - uid: 7694 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,-31.5 + parent: 31 + - uid: 7713 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-31.5 + parent: 31 + - uid: 7788 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 44.5,-15.5 + parent: 31 + - uid: 7805 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,-15.5 + parent: 31 + - uid: 7830 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-46.5 + parent: 31 - uid: 7864 components: - type: Transform pos: -12.5,27.5 parent: 31 + - uid: 8357 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-46.5 + parent: 31 + - uid: 8375 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-41.5 + parent: 31 + - uid: 8376 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-41.5 + parent: 31 + - uid: 8377 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-41.5 + parent: 31 + - uid: 8578 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-41.5 + parent: 31 + - uid: 8590 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-45.5 + parent: 31 - uid: 9554 components: - type: Transform @@ -60479,6 +60919,18 @@ entities: - type: Transform pos: -9.5,27.5 parent: 31 + - uid: 9915 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,16.5 + parent: 31 + - uid: 10027 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,17.5 + parent: 31 - uid: 10175 components: - type: Transform @@ -60491,6 +60943,33 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,-2.5 parent: 31 + - uid: 10209 + components: + - type: Transform + pos: 27.5,23.5 + parent: 31 + - uid: 10211 + components: + - type: Transform + pos: 26.5,23.5 + parent: 31 + - uid: 10245 + components: + - type: Transform + pos: 25.5,23.5 + parent: 31 + - uid: 10250 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -40.5,15.5 + parent: 31 + - uid: 10251 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -40.5,12.5 + parent: 31 - uid: 12086 components: - type: Transform @@ -60702,6 +61181,45 @@ entities: parent: 31 - proto: RailingCornerSmall entities: + - uid: 80 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 41.5,-15.5 + parent: 31 + - uid: 186 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,-11.5 + parent: 31 + - uid: 1107 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -36.5,27.5 + parent: 31 + - uid: 1113 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,27.5 + parent: 31 + - uid: 1124 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,27.5 + parent: 31 + - uid: 1125 + components: + - type: Transform + anchored: False + rot: 3.141592653589793 rad + pos: -38.5,27.5 + parent: 31 + - type: Physics + bodyType: Dynamic - uid: 2680 components: - type: Transform @@ -60720,6 +61238,23 @@ entities: rot: -1.5707963267948966 rad pos: 51.5,-22.5 parent: 31 + - uid: 2952 + components: + - type: Transform + pos: 52.5,-13.5 + parent: 31 + - uid: 3040 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 61.5,12.5 + parent: 31 + - uid: 3424 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 48.5,-13.5 + parent: 31 - uid: 4078 components: - type: Transform @@ -60820,23 +61355,177 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,27.5 parent: 31 + - uid: 6024 + components: + - type: Transform + pos: 13.5,-33.5 + parent: 31 + - uid: 6155 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-22.5 + parent: 31 + - uid: 6169 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,-7.5 + parent: 31 + - uid: 6174 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,-5.5 + parent: 31 + - uid: 6210 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-46.5 + parent: 31 + - uid: 6410 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,-3.5 + parent: 31 - uid: 7316 components: - type: Transform pos: 5.5,-35.5 parent: 31 + - uid: 7562 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-41.5 + parent: 31 + - uid: 7626 + components: + - type: Transform + pos: -12.5,-41.5 + parent: 31 + - uid: 7632 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,-9.5 + parent: 31 + - uid: 7637 + components: + - type: Transform + pos: -25.5,-31.5 + parent: 31 + - uid: 7639 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-33.5 + parent: 31 + - uid: 7697 + components: + - type: Transform + pos: 29.5,-24.5 + parent: 31 + - uid: 7745 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-45.5 + parent: 31 + - uid: 7746 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,-7.5 + parent: 31 + - uid: 7780 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,-31.5 + parent: 31 + - uid: 7781 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,-9.5 + parent: 31 - uid: 7791 components: - type: Transform rot: 3.141592653589793 rad pos: -19.5,27.5 parent: 31 + - uid: 8221 + components: + - type: Transform + pos: 29.5,-26.5 + parent: 31 + - uid: 8287 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,-24.5 + parent: 31 + - uid: 8388 + components: + - type: Transform + pos: 2.5,-46.5 + parent: 31 - uid: 8488 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-29.5 parent: 31 + - uid: 8577 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,-5.5 + parent: 31 + - uid: 8594 + components: + - type: Transform + pos: 45.5,-15.5 + parent: 31 + - uid: 10028 + components: + - type: Transform + pos: 55.5,14.5 + parent: 31 + - uid: 10029 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,18.5 + parent: 31 + - uid: 10246 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,23.5 + parent: 31 + - uid: 10247 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,23.5 + parent: 31 + - uid: 10252 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -40.5,13.5 + parent: 31 + - uid: 10372 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -40.5,14.5 + parent: 31 - uid: 10716 components: - type: Transform @@ -60849,6 +61538,12 @@ entities: rot: 3.141592653589793 rad pos: -16.5,27.5 parent: 31 + - uid: 10768 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-28.5 + parent: 31 - uid: 12082 components: - type: Transform @@ -60928,15 +61623,15 @@ entities: parent: 31 - proto: RandomArtifactSpawner entities: - - uid: 60 + - uid: 3735 components: - type: Transform - pos: -8.5,-31.5 + pos: -16.5,-30.5 parent: 31 - - uid: 3735 + - uid: 6474 components: - type: Transform - pos: -16.5,-30.5 + pos: -9.5,-25.5 parent: 31 - uid: 7544 components: @@ -60960,6 +61655,16 @@ entities: - type: Transform pos: 26.5,0.5 parent: 31 + - uid: 11390 + components: + - type: Transform + pos: -5.5,-32.5 + parent: 31 + - uid: 11391 + components: + - type: Transform + pos: -14.5,-19.5 + parent: 31 - proto: RandomDrinkGlass entities: - uid: 6101 @@ -61114,11 +61819,6 @@ entities: parent: 31 - proto: RandomPosterLegit entities: - - uid: 2557 - components: - - type: Transform - pos: -52.5,-8.5 - parent: 31 - uid: 4659 components: - type: Transform @@ -61178,6 +61878,18 @@ entities: rot: 3.141592653589793 rad pos: -0.5,35.5 parent: 31 + - uid: 6641 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -36.5,25.5 + parent: 31 + - uid: 7077 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,23.5 + parent: 31 - uid: 7476 components: - type: Transform @@ -61188,10 +61900,15 @@ entities: - type: Transform pos: -30.5,-6.5 parent: 31 - - uid: 10760 + - uid: 11402 + components: + - type: Transform + pos: -34.5,13.5 + parent: 31 + - uid: 11403 components: - type: Transform - pos: -47.5,-9.5 + pos: -17.5,-5.5 parent: 31 - proto: RandomSoap entities: @@ -61212,11 +61929,6 @@ entities: - type: Transform pos: -7.5,5.5 parent: 31 - - uid: 1364 - components: - - type: Transform - pos: -31.5,-32.5 - parent: 31 - uid: 1378 components: - type: Transform @@ -61247,6 +61959,11 @@ entities: - type: Transform pos: 30.5,-10.5 parent: 31 + - uid: 4415 + components: + - type: Transform + pos: -36.5,20.5 + parent: 31 - uid: 4512 components: - type: Transform @@ -61405,12 +62122,6 @@ entities: rot: 3.141592653589793 rad pos: 45.5,-10.5 parent: 31 - - uid: 10761 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,-11.5 - parent: 31 - uid: 11028 components: - type: Transform @@ -61809,6 +62520,11 @@ entities: - type: Transform pos: 11.5,-6.5 parent: 31 + - uid: 297 + components: + - type: Transform + pos: -35.5,26.5 + parent: 31 - uid: 307 components: - type: Transform @@ -61817,7 +62533,7 @@ entities: - uid: 335 components: - type: Transform - pos: -50.5,-8.5 + pos: -37.5,26.5 parent: 31 - uid: 410 components: @@ -61829,11 +62545,6 @@ entities: - type: Transform pos: 30.5,4.5 parent: 31 - - uid: 546 - components: - - type: Transform - pos: -39.5,19.5 - parent: 31 - uid: 550 components: - type: Transform @@ -61855,16 +62566,6 @@ entities: - type: Transform pos: -42.5,-0.5 parent: 31 - - uid: 697 - components: - - type: Transform - pos: -49.5,-8.5 - parent: 31 - - uid: 717 - components: - - type: Transform - pos: -48.5,-8.5 - parent: 31 - uid: 740 components: - type: Transform @@ -62328,11 +63029,33 @@ entities: - type: Transform pos: 28.5,-23.5 parent: 31 + - uid: 4951 + components: + - type: Transform + pos: -35.5,-2.5 + parent: 31 + - uid: 4954 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,-6.5 + parent: 31 - uid: 5002 components: - type: Transform pos: 28.5,-14.5 parent: 31 + - uid: 5051 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,-4.5 + parent: 31 + - uid: 5052 + components: + - type: Transform + pos: -36.5,-2.5 + parent: 31 - uid: 5073 components: - type: Transform @@ -62354,20 +63077,15 @@ entities: - type: Transform pos: -2.5,6.5 parent: 31 - - uid: 5158 + - uid: 5129 components: - type: Transform - pos: -49.5,3.5 - parent: 31 - - uid: 5229 - components: - - type: Transform - pos: -29.5,18.5 + pos: -38.5,-2.5 parent: 31 - - uid: 5230 + - uid: 5158 components: - type: Transform - pos: -28.5,18.5 + pos: -49.5,3.5 parent: 31 - uid: 5940 components: @@ -62375,15 +63093,11 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,37.5 parent: 31 - - uid: 5988 - components: - - type: Transform - pos: -40.5,-8.5 - parent: 31 - - uid: 6174 + - uid: 6161 components: - type: Transform - pos: -41.5,-8.5 + rot: -1.5707963267948966 rad + pos: -40.5,25.5 parent: 31 - uid: 6215 components: @@ -62446,11 +63160,6 @@ entities: - type: Transform pos: 46.5,18.5 parent: 31 - - uid: 6495 - components: - - type: Transform - pos: -45.5,-8.5 - parent: 31 - uid: 6497 components: - type: Transform @@ -62466,11 +63175,6 @@ entities: - type: Transform pos: 45.5,9.5 parent: 31 - - uid: 6567 - components: - - type: Transform - pos: -49.5,-12.5 - parent: 31 - uid: 6614 components: - type: Transform @@ -62597,11 +63301,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-32.5 parent: 31 - - uid: 7473 - components: - - type: Transform - pos: -31.5,19.5 - parent: 31 - uid: 7540 components: - type: Transform @@ -62648,11 +63347,6 @@ entities: - type: Transform pos: -3.5,8.5 parent: 31 - - uid: 7818 - components: - - type: Transform - pos: -39.5,18.5 - parent: 31 - uid: 7820 components: - type: Transform @@ -62674,10 +63368,11 @@ entities: - type: Transform pos: 34.5,-14.5 parent: 31 - - uid: 7963 + - uid: 8029 components: - type: Transform - pos: -42.5,-8.5 + rot: -1.5707963267948966 rad + pos: -40.5,16.5 parent: 31 - uid: 8090 components: @@ -62691,26 +63386,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-31.5 parent: 31 - - uid: 8204 - components: - - type: Transform - pos: -48.5,-12.5 - parent: 31 - - uid: 8221 - components: - - type: Transform - pos: -32.5,19.5 - parent: 31 - - uid: 8296 - components: - - type: Transform - pos: -46.5,-8.5 - parent: 31 - - uid: 8300 - components: - - type: Transform - pos: -54.5,-10.5 - parent: 31 - uid: 8302 components: - type: Transform @@ -62736,21 +63411,6 @@ entities: - type: Transform pos: -35.5,-15.5 parent: 31 - - uid: 8374 - components: - - type: Transform - pos: -46.5,-12.5 - parent: 31 - - uid: 8382 - components: - - type: Transform - pos: -47.5,-8.5 - parent: 31 - - uid: 8383 - components: - - type: Transform - pos: -47.5,-12.5 - parent: 31 - uid: 8460 components: - type: Transform @@ -62844,25 +63504,38 @@ entities: - type: Transform pos: 5.5,-7.5 parent: 31 - - uid: 9173 + - uid: 9172 + components: + - type: Transform + pos: -37.5,-2.5 + parent: 31 + - uid: 9174 components: - type: Transform - pos: -35.5,-12.5 + rot: -1.5707963267948966 rad + pos: -34.5,-10.5 + parent: 31 + - uid: 9183 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,-8.5 parent: 31 - uid: 9187 components: - type: Transform pos: -39.5,-1.5 parent: 31 - - uid: 9189 + - uid: 9201 components: - type: Transform - pos: -36.5,-12.5 + rot: 3.141592653589793 rad + pos: -39.5,15.5 parent: 31 - - uid: 9194 + - uid: 9209 components: - type: Transform - pos: -37.5,-12.5 + pos: -39.5,-2.5 parent: 31 - uid: 9357 components: @@ -63019,11 +63692,6 @@ entities: - type: Transform pos: 54.5,-8.5 parent: 31 - - uid: 9711 - components: - - type: Transform - pos: -39.5,14.5 - parent: 31 - uid: 9934 components: - type: Transform @@ -63153,11 +63821,6 @@ entities: rot: 1.5707963267948966 rad pos: 44.5,-14.5 parent: 31 - - uid: 10752 - components: - - type: Transform - pos: -54.5,-9.5 - parent: 31 - uid: 10818 components: - type: Transform @@ -63191,24 +63854,6 @@ entities: - type: Transform pos: -47.5,3.5 parent: 31 - - uid: 11411 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,-6.5 - parent: 31 - - uid: 11412 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -43.5,-4.5 - parent: 31 - - uid: 11413 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,-2.5 - parent: 31 - uid: 11439 components: - type: Transform @@ -63518,6 +64163,11 @@ entities: - type: Transform pos: -11.5,-28.5 parent: 31 + - uid: 11076 + components: + - type: Transform + pos: 38.5,-19.5 + parent: 31 - proto: SalvageLootSpawner entities: - uid: 592 @@ -63525,6 +64175,11 @@ entities: - type: Transform pos: -5.5,-28.5 parent: 31 + - uid: 4104 + components: + - type: Transform + pos: -3.5,-19.5 + parent: 31 - proto: Saw entities: - uid: 11905 @@ -63665,6 +64320,14 @@ entities: - type: Transform pos: -6.54687,-32.500237 parent: 31 +- proto: SheetPlasma1 + entities: + - uid: 11396 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.564943,1.4156554 + parent: 31 - proto: SheetPlasteel entities: - uid: 738 @@ -64518,13 +65181,6 @@ entities: - type: Transform pos: 21.5,28.5 parent: 31 -- proto: SignChapel - entities: - - uid: 7694 - components: - - type: Transform - pos: -38.5,11.5 - parent: 31 - proto: SignChem entities: - uid: 4889 @@ -64539,10 +65195,10 @@ entities: parent: 31 - proto: SignCloning entities: - - uid: 4133 + - uid: 8030 components: - type: Transform - pos: 10.5,-12.5 + pos: 20.5,-13.5 parent: 31 - proto: SignConference entities: @@ -64624,22 +65280,6 @@ entities: rot: 3.141592653589793 rad pos: 5.493867,-12.264781 parent: 31 -- proto: SignDirectionalChapel - entities: - - uid: 8239 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,11.5 - parent: 31 -- proto: SignDirectionalCryo - entities: - - uid: 9326 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -38.5,-2.5 - parent: 31 - proto: SignDirectionalDorms entities: - uid: 2471 @@ -64784,6 +65424,20 @@ entities: - type: Transform pos: 30.5,6.5 parent: 31 +- proto: SignEscapePods + entities: + - uid: 7462 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-20.5 + parent: 31 + - uid: 10816 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,-18.5 + parent: 31 - proto: SignEVA entities: - uid: 150 @@ -64862,13 +65516,6 @@ entities: - type: Transform pos: -12.5,-13.5 parent: 31 -- proto: SignPrivateProperty - entities: - - uid: 13047 - components: - - type: Transform - pos: -36.5,16.5 - parent: 31 - proto: SignRadiation entities: - uid: 12072 @@ -64985,6 +65632,14 @@ entities: - type: Transform pos: 54.5,-10.5 parent: 31 +- proto: SignSecurity + entities: + - uid: 6994 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,16.5 + parent: 31 - proto: SignSomethingOld2 entities: - uid: 1469 @@ -65011,11 +65666,10 @@ entities: parent: 31 - proto: SignSurgery entities: - - uid: 1107 + - uid: 10762 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-13.5 + pos: 19.5,-19.5 parent: 31 - proto: SignTelecomms entities: @@ -65066,11 +65720,11 @@ entities: parent: 31 - proto: SinkWide entities: - - uid: 4225 + - uid: 267 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,-16.5 + rot: -1.5707963267948966 rad + pos: 19.5,-21.5 parent: 31 - uid: 5630 components: @@ -65088,7 +65742,7 @@ entities: - uid: 11043 components: - type: Transform - pos: -1.1721542,-19.976759 + pos: -1.824899,-20.3356 parent: 31 - type: Physics angularDamping: 0 @@ -65950,13 +66604,6 @@ entities: - type: Transform pos: -33.5,44.5 parent: 31 -- proto: SolidSecretDoor - entities: - - uid: 10710 - components: - - type: Transform - pos: -32.5,15.5 - parent: 31 - proto: SophicScribeSpawner entities: - uid: 6317 @@ -66144,6 +66791,11 @@ entities: - type: Transform pos: -19.5,-12.5 parent: 31 + - uid: 10763 + components: + - type: Transform + pos: -23.5,16.5 + parent: 31 - uid: 12231 components: - type: Transform @@ -66189,29 +66841,19 @@ entities: - type: Transform pos: -21.5,-6.5 parent: 31 -- proto: SpawnPointLatejoin +- proto: SpawnPointLibrarian entities: - - uid: 9749 - components: - - type: Transform - pos: -36.5,-9.5 - parent: 31 - - uid: 9750 - components: - - type: Transform - pos: -36.5,-7.5 - parent: 31 - - uid: 9751 + - uid: 11678 components: - type: Transform - pos: -36.5,-6.5 + pos: 12.5,-29.5 parent: 31 -- proto: SpawnPointLibrarian +- proto: SpawnPointMailCarrier entities: - - uid: 11678 + - uid: 11397 components: - type: Transform - pos: 12.5,-29.5 + pos: 21.5,16.5 parent: 31 - proto: SpawnPointMedicalDoctor entities: @@ -66308,6 +66950,13 @@ entities: - type: Transform pos: -4.5,-23.5 parent: 31 +- proto: SpawnPointRoboticist + entities: + - uid: 3768 + components: + - type: Transform + pos: -1.5,-26.5 + parent: 31 - proto: SpawnPointSalvageSpecialist entities: - uid: 5917 @@ -66402,6 +67051,11 @@ entities: - type: Transform pos: 31.5,-1.5 parent: 31 + - uid: 7478 + components: + - type: Transform + pos: -34.5,-26.5 + parent: 31 - proto: SpawnPointTechnicalAssistant entities: - uid: 9103 @@ -66542,18 +67196,18 @@ entities: - type: Transform pos: 23.5,6.5 parent: 31 - - uid: 8849 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -34.5,-9.5 - parent: 31 - uid: 9021 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,-17.5 parent: 31 + - uid: 10437 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -39.5,19.5 + parent: 31 - proto: SteelBench entities: - uid: 1151 @@ -66905,6 +67559,13 @@ entities: - type: Transform pos: -13.5,11.5 parent: 31 +- proto: SuitStorageParamedic + entities: + - uid: 9749 + components: + - type: Transform + pos: 23.5,-7.5 + parent: 31 - proto: SuitStorageSec entities: - uid: 768 @@ -67140,17 +67801,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: East Hallway - - uid: 3050 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,-8.5 - parent: 31 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Arrivals - uid: 4361 components: - type: Transform @@ -67173,6 +67823,12 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Medical Hallway + - uid: 4462 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,20.5 + parent: 31 - uid: 4549 components: - type: Transform @@ -67568,6 +68224,18 @@ entities: - type: Transform pos: 15.852729,-6.338344 parent: 31 +- proto: SyringePhalanximine + entities: + - uid: 3245 + components: + - type: Transform + pos: 20.61831,-15.490519 + parent: 31 + - uid: 3910 + components: + - type: Transform + pos: 20.753729,-15.594757 + parent: 31 - proto: Table entities: - uid: 206 @@ -67763,11 +68431,6 @@ entities: - type: Transform pos: 19.5,-8.5 parent: 31 - - uid: 2807 - components: - - type: Transform - pos: -48.5,-9.5 - parent: 31 - uid: 3106 components: - type: Transform @@ -67804,6 +68467,11 @@ entities: - type: Transform pos: 48.5,-30.5 parent: 31 + - uid: 4041 + components: + - type: Transform + pos: -3.5,-19.5 + parent: 31 - uid: 4076 components: - type: Transform @@ -67849,12 +68517,6 @@ entities: - type: Transform pos: 55.5,-24.5 parent: 31 - - uid: 4826 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-18.5 - parent: 31 - uid: 4904 components: - type: Transform @@ -67882,6 +68544,16 @@ entities: - type: Transform pos: 28.5,0.5 parent: 31 + - uid: 5192 + components: + - type: Transform + pos: -34.5,12.5 + parent: 31 + - uid: 5229 + components: + - type: Transform + pos: -34.5,13.5 + parent: 31 - uid: 5754 components: - type: Transform @@ -67978,23 +68650,11 @@ entities: - type: Transform pos: 7.5,-13.5 parent: 31 - - uid: 7597 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-18.5 - parent: 31 - uid: 7599 components: - type: Transform pos: -5.5,-28.5 parent: 31 - - uid: 7626 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-18.5 - parent: 31 - uid: 7815 components: - type: Transform @@ -68051,6 +68711,11 @@ entities: - type: Transform pos: 1.5,-26.5 parent: 31 + - uid: 8637 + components: + - type: Transform + pos: -36.5,25.5 + parent: 31 - uid: 8784 components: - type: Transform @@ -68081,6 +68746,16 @@ entities: - type: Transform pos: 18.5,17.5 parent: 31 + - uid: 9207 + components: + - type: Transform + pos: -30.5,22.5 + parent: 31 + - uid: 9211 + components: + - type: Transform + pos: -30.5,23.5 + parent: 31 - uid: 9510 components: - type: Transform @@ -68188,11 +68863,6 @@ entities: - type: Transform pos: -0.5,-12.5 parent: 31 - - uid: 10758 - components: - - type: Transform - pos: -47.5,-9.5 - parent: 31 - uid: 10796 components: - type: Transform @@ -68495,11 +69165,6 @@ entities: - type: Transform pos: 14.5,-5.5 parent: 31 - - uid: 2193 - components: - - type: Transform - pos: 19.5,-20.5 - parent: 31 - uid: 3801 components: - type: Transform @@ -68531,6 +69196,17 @@ entities: - type: Transform pos: 27.5,15.5 parent: 31 + - uid: 4423 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,19.5 + parent: 31 + - uid: 4426 + components: + - type: Transform + pos: -33.5,18.5 + parent: 31 - uid: 4573 components: - type: Transform @@ -68552,11 +69228,28 @@ entities: - type: Transform pos: 13.5,-0.5 parent: 31 + - uid: 5170 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -29.5,19.5 + parent: 31 + - uid: 5180 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,19.5 + parent: 31 - uid: 6252 components: - type: Transform pos: 37.5,-0.5 parent: 31 + - uid: 6809 + components: + - type: Transform + pos: -28.5,18.5 + parent: 31 - uid: 7046 components: - type: Transform @@ -68636,6 +69329,12 @@ entities: - type: Transform pos: -16.5,-18.5 parent: 31 + - uid: 10774 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-18.5 + parent: 31 - uid: 10825 components: - type: Transform @@ -68673,6 +69372,11 @@ entities: - type: Transform pos: -4.5,-21.5 parent: 31 + - uid: 4900 + components: + - type: Transform + pos: -38.5,20.5 + parent: 31 - uid: 5077 components: - type: Transform @@ -68697,6 +69401,11 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,0.5 parent: 31 + - uid: 10417 + components: + - type: Transform + pos: -38.5,21.5 + parent: 31 - uid: 12058 components: - type: Transform @@ -68862,11 +69571,6 @@ entities: - type: Transform pos: 11.5,-31.5 parent: 31 - - uid: 7462 - components: - - type: Transform - pos: -29.5,17.5 - parent: 31 - uid: 7849 components: - type: Transform @@ -68936,12 +69640,6 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-4.5 parent: 31 - - uid: 10478 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -31.5,17.5 - parent: 31 - uid: 10618 components: - type: Transform @@ -69206,6 +69904,11 @@ entities: - type: Transform pos: -30.309246,-9.267263 parent: 31 + - uid: 10749 + components: + - type: Transform + pos: -35.2357,24.709715 + parent: 31 - proto: ToolboxElectricalFilled entities: - uid: 4290 @@ -69230,6 +69933,11 @@ entities: - type: Transform pos: 4.4022307,35.456944 parent: 31 + - uid: 8220 + components: + - type: Transform + pos: -34.49979,13.157952 + parent: 31 - proto: ToolboxGoldFilled entities: - uid: 4194 @@ -69275,11 +69983,6 @@ entities: parent: 31 - proto: ToySpawner entities: - - uid: 521 - components: - - type: Transform - pos: -31.5,16.5 - parent: 31 - uid: 867 components: - type: Transform @@ -69312,6 +70015,13 @@ entities: - type: Transform pos: 48.60447,5.4525433 parent: 31 +- proto: UnfinishedMachineFrame + entities: + - uid: 10760 + components: + - type: Transform + pos: -34.5,25.5 + parent: 31 - proto: UniformPrinter entities: - uid: 8408 @@ -69475,6 +70185,11 @@ entities: parent: 31 - proto: VendingMachineCigs entities: + - uid: 2204 + components: + - type: Transform + pos: -35.5,25.5 + parent: 31 - uid: 9793 components: - type: Transform @@ -69530,12 +70245,6 @@ entities: - type: Transform pos: 35.5,6.5 parent: 31 - - uid: 9739 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -38.5,-5.5 - parent: 31 - uid: 10840 components: - type: Transform @@ -69560,6 +70269,13 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,2.5 parent: 31 +- proto: VendingMachineCourierDrobe + entities: + - uid: 11398 + components: + - type: Transform + pos: 23.5,15.5 + parent: 31 - proto: VendingMachineCuraDrobe entities: - uid: 9049 @@ -69661,6 +70377,13 @@ entities: - type: Transform pos: -18.5,-2.5 parent: 31 +- proto: VendingMachinePwrGame + entities: + - uid: 7062 + components: + - type: Transform + pos: -37.5,25.5 + parent: 31 - proto: VendingMachineRestockBooze entities: - uid: 10691 @@ -69675,6 +70398,13 @@ entities: - type: Transform pos: 22.561508,-10.156418 parent: 31 +- proto: VendingMachineRestockRobotics + entities: + - uid: 11404 + components: + - type: Transform + pos: -3.3367896,-19.24318 + parent: 31 - proto: VendingMachineRoboDrobe entities: - uid: 1482 @@ -69739,6 +70469,14 @@ entities: - type: Transform pos: 26.5,6.5 parent: 31 +- proto: VendingMachineSnackTeal + entities: + - uid: 5160 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -38.5,14.5 + parent: 31 - proto: VendingMachineSolsnack entities: - uid: 113 @@ -69900,6 +70638,12 @@ entities: parent: 31 - proto: WallmountTelevision entities: + - uid: 4877 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -39.5,21.5 + parent: 31 - uid: 7747 components: - type: Transform @@ -69968,6 +70712,11 @@ entities: - type: Transform pos: -13.5,26.5 parent: 31 + - uid: 138 + components: + - type: Transform + pos: -27.5,16.5 + parent: 31 - uid: 147 components: - type: Transform @@ -69983,6 +70732,12 @@ entities: - type: Transform pos: -16.5,-28.5 parent: 31 + - uid: 208 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -41.5,16.5 + parent: 31 - uid: 209 components: - type: Transform @@ -70039,8 +70794,18 @@ entities: - uid: 401 components: - type: Transform - rot: 3.141592653589793 rad - pos: 32.5,-19.5 + rot: -1.5707963267948966 rad + pos: -39.5,22.5 + parent: 31 + - uid: 420 + components: + - type: Transform + pos: -31.5,25.5 + parent: 31 + - uid: 421 + components: + - type: Transform + pos: -30.5,25.5 parent: 31 - uid: 447 components: @@ -70278,11 +71043,6 @@ entities: - type: Transform pos: 29.5,-16.5 parent: 31 - - uid: 975 - components: - - type: Transform - pos: -37.5,20.5 - parent: 31 - uid: 1035 components: - type: Transform @@ -70441,6 +71201,12 @@ entities: - type: Transform pos: 11.5,18.5 parent: 31 + - uid: 1311 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,25.5 + parent: 31 - uid: 1317 components: - type: Transform @@ -70451,11 +71217,23 @@ entities: - type: Transform pos: 29.5,15.5 parent: 31 + - uid: 1364 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -38.5,26.5 + parent: 31 - uid: 1377 components: - type: Transform pos: 61.5,5.5 parent: 31 + - uid: 1385 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,26.5 + parent: 31 - uid: 1392 components: - type: Transform @@ -70648,6 +71426,12 @@ entities: - type: Transform pos: 22.5,-26.5 parent: 31 + - uid: 1638 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,-5.5 + parent: 31 - uid: 1642 components: - type: Transform @@ -71587,6 +72371,11 @@ entities: - type: Transform pos: 19.5,2.5 parent: 31 + - uid: 2130 + components: + - type: Transform + pos: -30.5,20.5 + parent: 31 - uid: 2156 components: - type: Transform @@ -71608,6 +72397,11 @@ entities: rot: 1.5707963267948966 rad pos: 53.5,-22.5 parent: 31 + - uid: 2193 + components: + - type: Transform + pos: -31.5,20.5 + parent: 31 - uid: 2215 components: - type: Transform @@ -71833,6 +72627,11 @@ entities: - type: Transform pos: 14.5,25.5 parent: 31 + - uid: 2537 + components: + - type: Transform + pos: -36.5,26.5 + parent: 31 - uid: 2671 components: - type: Transform @@ -71914,12 +72713,6 @@ entities: - type: Transform pos: 59.5,8.5 parent: 31 - - uid: 3743 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -29.5,-28.5 - parent: 31 - uid: 3802 components: - type: Transform @@ -71945,6 +72738,18 @@ entities: - type: Transform pos: 15.5,22.5 parent: 31 + - uid: 3892 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,26.5 + parent: 31 + - uid: 3893 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,25.5 + parent: 31 - uid: 3934 components: - type: Transform @@ -72140,6 +72945,11 @@ entities: rot: 1.5707963267948966 rad pos: 72.5,5.5 parent: 31 + - uid: 4422 + components: + - type: Transform + pos: -32.5,20.5 + parent: 31 - uid: 4428 components: - type: Transform @@ -72170,6 +72980,11 @@ entities: - type: Transform pos: 55.5,12.5 parent: 31 + - uid: 4486 + components: + - type: Transform + pos: 33.5,-19.5 + parent: 31 - uid: 4502 components: - type: Transform @@ -72479,16 +73294,6 @@ entities: - type: Transform pos: 35.5,-19.5 parent: 31 - - uid: 4862 - components: - - type: Transform - pos: 36.5,-19.5 - parent: 31 - - uid: 4864 - components: - - type: Transform - pos: 37.5,-19.5 - parent: 31 - uid: 4867 components: - type: Transform @@ -72636,6 +73441,12 @@ entities: - type: Transform pos: -5.5,-24.5 parent: 31 + - uid: 5175 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -29.5,24.5 + parent: 31 - uid: 5176 components: - type: Transform @@ -72676,10 +73487,11 @@ entities: - type: Transform pos: -25.5,25.5 parent: 31 - - uid: 5233 + - uid: 5199 components: - type: Transform - pos: -39.5,15.5 + rot: -1.5707963267948966 rad + pos: -29.5,22.5 parent: 31 - uid: 5236 components: @@ -72854,11 +73666,6 @@ entities: - type: Transform pos: -27.5,-10.5 parent: 31 - - uid: 5610 - components: - - type: Transform - pos: -39.5,17.5 - parent: 31 - uid: 5674 components: - type: Transform @@ -72869,11 +73676,6 @@ entities: - type: Transform pos: 68.5,11.5 parent: 31 - - uid: 5719 - components: - - type: Transform - pos: -39.5,-8.5 - parent: 31 - uid: 5729 components: - type: Transform @@ -72911,12 +73713,6 @@ entities: - type: Transform pos: -29.5,-8.5 parent: 31 - - uid: 5983 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -44.5,-8.5 - parent: 31 - uid: 5995 components: - type: Transform @@ -72939,11 +73735,6 @@ entities: - type: Transform pos: 72.5,11.5 parent: 31 - - uid: 6210 - components: - - type: Transform - pos: -42.5,-12.5 - parent: 31 - uid: 6230 components: - type: Transform @@ -73091,11 +73882,6 @@ entities: - type: Transform pos: 37.5,10.5 parent: 31 - - uid: 6474 - components: - - type: Transform - pos: -52.5,-12.5 - parent: 31 - uid: 6475 components: - type: Transform @@ -73124,12 +73910,13 @@ entities: - uid: 6493 components: - type: Transform - pos: -52.5,-8.5 + rot: -1.5707963267948966 rad + pos: -39.5,16.5 parent: 31 - - uid: 6494 + - uid: 6495 components: - type: Transform - pos: -54.5,-8.5 + pos: -30.5,21.5 parent: 31 - uid: 6496 components: @@ -73154,7 +73941,8 @@ entities: - uid: 6505 components: - type: Transform - pos: -54.5,-12.5 + rot: -1.5707963267948966 rad + pos: -39.5,18.5 parent: 31 - uid: 6537 components: @@ -73171,11 +73959,6 @@ entities: - type: Transform pos: 32.5,18.5 parent: 31 - - uid: 6576 - components: - - type: Transform - pos: -45.5,-12.5 - parent: 31 - uid: 6583 components: - type: Transform @@ -73197,11 +73980,6 @@ entities: - type: Transform pos: 29.5,13.5 parent: 31 - - uid: 6612 - components: - - type: Transform - pos: -40.5,-12.5 - parent: 31 - uid: 6615 components: - type: Transform @@ -73239,16 +74017,6 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,24.5 parent: 31 - - uid: 6809 - components: - - type: Transform - pos: -43.5,-12.5 - parent: 31 - - uid: 6810 - components: - - type: Transform - pos: -38.5,-7.5 - parent: 31 - uid: 6811 components: - type: Transform @@ -73458,11 +74226,6 @@ entities: - type: Transform pos: 30.5,17.5 parent: 31 - - uid: 7062 - components: - - type: Transform - pos: 31.5,-20.5 - parent: 31 - uid: 7069 components: - type: Transform @@ -73643,11 +74406,6 @@ entities: - type: Transform pos: -16.5,-31.5 parent: 31 - - uid: 7475 - components: - - type: Transform - pos: -30.5,19.5 - parent: 31 - uid: 7481 components: - type: Transform @@ -73759,15 +74517,16 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,-31.5 parent: 31 - - uid: 7601 + - uid: 7597 components: - type: Transform - pos: -10.5,-32.5 + rot: -1.5707963267948966 rad + pos: -41.5,18.5 parent: 31 - - uid: 7629 + - uid: 7601 components: - type: Transform - pos: -39.5,16.5 + pos: -10.5,-32.5 parent: 31 - uid: 7633 components: @@ -73797,7 +74556,8 @@ entities: - uid: 7712 components: - type: Transform - pos: -54.5,-11.5 + rot: -1.5707963267948966 rad + pos: -40.5,23.5 parent: 31 - uid: 7751 components: @@ -73814,21 +74574,17 @@ entities: - type: Transform pos: 20.5,-12.5 parent: 31 - - uid: 7805 + - uid: 7818 components: - type: Transform - pos: -53.5,-12.5 + rot: -1.5707963267948966 rad + pos: -34.5,26.5 parent: 31 - uid: 7822 components: - type: Transform pos: 22.5,-12.5 parent: 31 - - uid: 7831 - components: - - type: Transform - pos: -43.5,-8.5 - parent: 31 - uid: 7846 components: - type: Transform @@ -73845,27 +74601,12 @@ entities: - type: Transform pos: 33.5,21.5 parent: 31 - - uid: 7968 - components: - - type: Transform - pos: -36.5,20.5 - parent: 31 - uid: 8019 components: - type: Transform rot: 3.141592653589793 rad pos: 57.5,9.5 parent: 31 - - uid: 8026 - components: - - type: Transform - pos: -53.5,-8.5 - parent: 31 - - uid: 8051 - components: - - type: Transform - pos: -39.5,-12.5 - parent: 31 - uid: 8075 components: - type: Transform @@ -73952,21 +74693,11 @@ entities: - type: Transform pos: 71.5,5.5 parent: 31 - - uid: 8212 - components: - - type: Transform - pos: -41.5,-12.5 - parent: 31 - uid: 8215 components: - type: Transform pos: 39.5,-15.5 parent: 31 - - uid: 8220 - components: - - type: Transform - pos: -30.5,18.5 - parent: 31 - uid: 8233 components: - type: Transform @@ -73979,27 +74710,27 @@ entities: rot: 3.141592653589793 rad pos: 48.5,-23.5 parent: 31 - - uid: 8250 + - uid: 8290 components: - type: Transform - rot: 3.141592653589793 rad - pos: 33.5,-19.5 + rot: -1.5707963267948966 rad + pos: 15.5,20.5 parent: 31 - - uid: 8287 + - uid: 8305 components: - type: Transform - pos: -50.5,-12.5 + pos: 38.5,-20.5 parent: 31 - - uid: 8289 + - uid: 8308 components: - type: Transform - pos: -51.5,-8.5 + rot: -1.5707963267948966 rad + pos: -29.5,23.5 parent: 31 - - uid: 8290 + - uid: 8310 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,20.5 + pos: 35.5,-20.5 parent: 31 - uid: 8311 components: @@ -74012,6 +74743,11 @@ entities: rot: 1.5707963267948966 rad pos: 69.5,3.5 parent: 31 + - uid: 8319 + components: + - type: Transform + pos: 36.5,-20.5 + parent: 31 - uid: 8325 components: - type: Transform @@ -74042,6 +74778,17 @@ entities: rot: 3.141592653589793 rad pos: 53.5,-29.5 parent: 31 + - uid: 8340 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,14.5 + parent: 31 + - uid: 8341 + components: + - type: Transform + pos: -32.5,25.5 + parent: 31 - uid: 8368 components: - type: Transform @@ -74058,6 +74805,12 @@ entities: rot: 3.141592653589793 rad pos: 56.5,-25.5 parent: 31 + - uid: 8387 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,23.5 + parent: 31 - uid: 8391 components: - type: Transform @@ -74227,12 +74980,43 @@ entities: - type: Transform pos: -33.5,-22.5 parent: 31 + - uid: 8579 + components: + - type: Transform + pos: -30.5,24.5 + parent: 31 + - uid: 8580 + components: + - type: Transform + pos: 33.5,-20.5 + parent: 31 + - uid: 8591 + components: + - type: Transform + pos: 34.5,-20.5 + parent: 31 + - uid: 8593 + components: + - type: Transform + pos: 37.5,-20.5 + parent: 31 - uid: 8615 components: - type: Transform rot: 3.141592653589793 rad pos: 45.5,-23.5 parent: 31 + - uid: 8636 + components: + - type: Transform + pos: -39.5,21.5 + parent: 31 + - uid: 8638 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -41.5,23.5 + parent: 31 - uid: 8695 components: - type: Transform @@ -74263,11 +75047,6 @@ entities: rot: 3.141592653589793 rad pos: 54.5,-20.5 parent: 31 - - uid: 8745 - components: - - type: Transform - pos: 34.5,-19.5 - parent: 31 - uid: 8756 components: - type: Transform @@ -74325,7 +75104,8 @@ entities: - uid: 8806 components: - type: Transform - pos: -38.5,20.5 + rot: -1.5707963267948966 rad + pos: -29.5,21.5 parent: 31 - uid: 8811 components: @@ -74363,11 +75143,6 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,37.5 parent: 31 - - uid: 8830 - components: - - type: Transform - pos: 38.5,-19.5 - parent: 31 - uid: 8831 components: - type: Transform @@ -74465,26 +75240,51 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-28.5 parent: 31 - - uid: 9182 + - uid: 9169 components: - type: Transform - pos: -38.5,-8.5 + pos: -28.5,20.5 parent: 31 - - uid: 9183 + - uid: 9176 components: - type: Transform - pos: -38.5,-6.5 + rot: -1.5707963267948966 rad + pos: -34.5,-7.5 parent: 31 - - uid: 9185 + - uid: 9177 components: - type: Transform - pos: -39.5,-2.5 + rot: -1.5707963267948966 rad + pos: -34.5,-11.5 + parent: 31 + - uid: 9178 + components: + - type: Transform + pos: -34.5,-2.5 + parent: 31 + - uid: 9182 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,-3.5 parent: 31 - uid: 9186 components: - type: Transform pos: -39.5,-0.5 parent: 31 + - uid: 9189 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,15.5 + parent: 31 + - uid: 9191 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -29.5,15.5 + parent: 31 - uid: 9192 components: - type: Transform @@ -74494,7 +75294,8 @@ entities: - uid: 9193 components: - type: Transform - pos: -38.5,-12.5 + rot: -1.5707963267948966 rad + pos: -34.5,-9.5 parent: 31 - uid: 9203 components: @@ -74505,7 +75306,18 @@ entities: - uid: 9205 components: - type: Transform - pos: -39.5,-6.5 + pos: -33.5,20.5 + parent: 31 + - uid: 9208 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,19.5 + parent: 31 + - uid: 9210 + components: + - type: Transform + pos: -29.5,20.5 parent: 31 - uid: 9253 components: @@ -74648,15 +75460,10 @@ entities: pos: -5.5,26.5 parent: 31 - uid: 9327 - components: - - type: Transform - pos: -43.5,-2.5 - parent: 31 - - uid: 9329 components: - type: Transform rot: -1.5707963267948966 rad - pos: -34.5,19.5 + pos: -27.5,15.5 parent: 31 - uid: 9342 components: @@ -74897,10 +75704,17 @@ entities: - type: Transform pos: 2.5,-44.5 parent: 31 + - uid: 9616 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,15.5 + parent: 31 - uid: 9624 components: - type: Transform - pos: -42.5,-2.5 + rot: -1.5707963267948966 rad + pos: -30.5,15.5 parent: 31 - uid: 9636 components: @@ -74952,12 +75766,24 @@ entities: - type: Transform pos: 3.5,-43.5 parent: 31 + - uid: 9700 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,15.5 + parent: 31 - uid: 9705 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,31.5 parent: 31 + - uid: 9711 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,15.5 + parent: 31 - uid: 9721 components: - type: Transform @@ -74983,6 +75809,12 @@ entities: - type: Transform pos: -39.5,20.5 parent: 31 + - uid: 9751 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -40.5,18.5 + parent: 31 - uid: 9792 components: - type: Transform @@ -74994,6 +75826,12 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-37.5 parent: 31 + - uid: 9838 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -41.5,25.5 + parent: 31 - uid: 9857 components: - type: Transform @@ -75006,12 +75844,6 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-39.5 parent: 31 - - uid: 9892 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,19.5 - parent: 31 - uid: 9924 components: - type: Transform @@ -75030,6 +75862,11 @@ entities: rot: 3.141592653589793 rad pos: 40.5,-15.5 parent: 31 + - uid: 10012 + components: + - type: Transform + pos: -33.5,17.5 + parent: 31 - uid: 10019 components: - type: Transform @@ -75137,16 +75974,6 @@ entities: - type: Transform pos: -35.5,-17.5 parent: 31 - - uid: 10209 - components: - - type: Transform - pos: -35.5,20.5 - parent: 31 - - uid: 10211 - components: - - type: Transform - pos: -34.5,20.5 - parent: 31 - uid: 10244 components: - type: Transform @@ -75222,6 +76049,11 @@ entities: - type: Transform pos: -0.5,-22.5 parent: 31 + - uid: 10765 + components: + - type: Transform + pos: 34.5,-19.5 + parent: 31 - uid: 10804 components: - type: Transform @@ -75239,6 +76071,11 @@ entities: - type: Transform pos: -1.5,-23.5 parent: 31 + - uid: 11014 + components: + - type: Transform + pos: 39.5,-20.5 + parent: 31 - uid: 11038 components: - type: Transform @@ -75344,12 +76181,6 @@ entities: rot: 1.5707963267948966 rad pos: 73.5,-1.5 parent: 31 - - uid: 11165 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-28.5 - parent: 31 - uid: 11170 components: - type: Transform @@ -75392,12 +76223,6 @@ entities: rot: 1.5707963267948966 rad pos: 69.5,-2.5 parent: 31 - - uid: 11185 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -29.5,-29.5 - parent: 31 - uid: 11187 components: - type: Transform @@ -75409,36 +76234,6 @@ entities: rot: 3.141592653589793 rad pos: 54.5,14.5 parent: 31 - - uid: 11390 - components: - - type: Transform - pos: -40.5,-2.5 - parent: 31 - - uid: 11391 - components: - - type: Transform - pos: -40.5,-6.5 - parent: 31 - - uid: 11392 - components: - - type: Transform - pos: -42.5,-6.5 - parent: 31 - - uid: 11393 - components: - - type: Transform - pos: -43.5,-6.5 - parent: 31 - - uid: 11394 - components: - - type: Transform - pos: -43.5,-3.5 - parent: 31 - - uid: 11395 - components: - - type: Transform - pos: -43.5,-5.5 - parent: 31 - uid: 11773 components: - type: Transform @@ -75609,11 +76404,6 @@ entities: rot: 3.141592653589793 rad pos: -31.5,1.5 parent: 31 - - uid: 251 - components: - - type: Transform - pos: -33.5,16.5 - parent: 31 - uid: 343 components: - type: Transform @@ -75658,12 +76448,6 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-10.5 parent: 31 - - uid: 527 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,-2.5 - parent: 31 - uid: 551 components: - type: Transform @@ -75887,26 +76671,6 @@ entities: - type: Transform pos: -23.5,0.5 parent: 31 - - uid: 1088 - components: - - type: Transform - pos: -34.5,-11.5 - parent: 31 - - uid: 1091 - components: - - type: Transform - pos: -34.5,-10.5 - parent: 31 - - uid: 1124 - components: - - type: Transform - pos: -34.5,-9.5 - parent: 31 - - uid: 1129 - components: - - type: Transform - pos: -34.5,-8.5 - parent: 31 - uid: 1189 components: - type: Transform @@ -75957,21 +76721,6 @@ entities: - type: Transform pos: -34.5,-1.5 parent: 31 - - uid: 1295 - components: - - type: Transform - pos: -34.5,-2.5 - parent: 31 - - uid: 1310 - components: - - type: Transform - pos: -34.5,-3.5 - parent: 31 - - uid: 1311 - components: - - type: Transform - pos: -34.5,-4.5 - parent: 31 - uid: 1314 components: - type: Transform @@ -76075,16 +76824,6 @@ entities: - type: Transform pos: -1.5,-7.5 parent: 31 - - uid: 1587 - components: - - type: Transform - pos: -27.5,17.5 - parent: 31 - - uid: 1588 - components: - - type: Transform - pos: -26.5,15.5 - parent: 31 - uid: 1612 components: - type: Transform @@ -76100,11 +76839,6 @@ entities: - type: Transform pos: 36.5,2.5 parent: 31 - - uid: 1638 - components: - - type: Transform - pos: -28.5,15.5 - parent: 31 - uid: 1639 components: - type: Transform @@ -76155,11 +76889,6 @@ entities: - type: Transform pos: -19.5,21.5 parent: 31 - - uid: 1679 - components: - - type: Transform - pos: -29.5,15.5 - parent: 31 - uid: 1685 components: - type: Transform @@ -76790,11 +77519,6 @@ entities: rot: 3.141592653589793 rad pos: -11.5,-23.5 parent: 31 - - uid: 2441 - components: - - type: Transform - pos: -34.5,-7.5 - parent: 31 - uid: 2443 components: - type: Transform @@ -76937,11 +77661,6 @@ entities: - type: Transform pos: 9.5,24.5 parent: 31 - - uid: 3768 - components: - - type: Transform - pos: -34.5,-6.5 - parent: 31 - uid: 3771 components: - type: Transform @@ -77171,12 +77890,6 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-19.5 parent: 31 - - uid: 4905 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-19.5 - parent: 31 - uid: 4946 components: - type: Transform @@ -77187,16 +77900,6 @@ entities: - type: Transform pos: 27.5,-21.5 parent: 31 - - uid: 4951 - components: - - type: Transform - pos: 26.5,-21.5 - parent: 31 - - uid: 4954 - components: - - type: Transform - pos: 25.5,-22.5 - parent: 31 - uid: 5011 components: - type: Transform @@ -77263,12 +77966,6 @@ entities: - type: Transform pos: -31.5,-5.5 parent: 31 - - uid: 5609 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,18.5 - parent: 31 - uid: 5734 components: - type: Transform @@ -77350,12 +78047,6 @@ entities: - type: Transform pos: 6.5,-9.5 parent: 31 - - uid: 7357 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,17.5 - parent: 31 - uid: 7368 components: - type: Transform @@ -77366,11 +78057,6 @@ entities: - type: Transform pos: 20.5,-21.5 parent: 31 - - uid: 7478 - components: - - type: Transform - pos: -30.5,17.5 - parent: 31 - uid: 7532 components: - type: Transform @@ -77401,11 +78087,6 @@ entities: - type: Transform pos: -17.5,-18.5 parent: 31 - - uid: 7675 - components: - - type: Transform - pos: -37.5,16.5 - parent: 31 - uid: 7702 components: - type: Transform @@ -77612,20 +78293,16 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,20.5 parent: 31 - - uid: 9169 - components: - - type: Transform - pos: -38.5,-2.5 - parent: 31 - uid: 9170 components: - type: Transform pos: 24.5,6.5 parent: 31 - - uid: 9191 + - uid: 9200 components: - type: Transform - pos: -33.5,15.5 + rot: 1.5707963267948966 rad + pos: 25.5,-22.5 parent: 31 - uid: 9204 components: @@ -77633,11 +78310,6 @@ entities: rot: 3.141592653589793 rad pos: 44.5,-5.5 parent: 31 - - uid: 9228 - components: - - type: Transform - pos: -30.5,16.5 - parent: 31 - uid: 9252 components: - type: Transform @@ -77698,6 +78370,24 @@ entities: - type: Transform pos: 9.5,-39.5 parent: 31 + - uid: 9326 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,-21.5 + parent: 31 + - uid: 9329 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-22.5 + parent: 31 + - uid: 9330 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-23.5 + parent: 31 - uid: 9346 components: - type: Transform @@ -77736,6 +78426,12 @@ entities: - type: Transform pos: -21.5,-8.5 parent: 31 + - uid: 9479 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-23.5 + parent: 31 - uid: 9517 components: - type: Transform @@ -77788,6 +78484,12 @@ entities: - type: Transform pos: 1.5,-23.5 parent: 31 + - uid: 9596 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-20.5 + parent: 31 - uid: 9601 components: - type: Transform @@ -78103,26 +78805,6 @@ entities: - type: Transform pos: -16.5,-9.5 parent: 31 - - uid: 10435 - components: - - type: Transform - pos: -34.5,16.5 - parent: 31 - - uid: 10436 - components: - - type: Transform - pos: -36.5,16.5 - parent: 31 - - uid: 10437 - components: - - type: Transform - pos: -35.5,16.5 - parent: 31 - - uid: 10440 - components: - - type: Transform - pos: -34.5,18.5 - parent: 31 - uid: 10477 components: - type: Transform @@ -78194,6 +78876,12 @@ entities: - type: Transform pos: -27.5,-25.5 parent: 31 + - uid: 10829 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-21.5 + parent: 31 - uid: 11158 components: - type: Transform @@ -78230,16 +78918,6 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,-24.5 parent: 31 - - uid: 11396 - components: - - type: Transform - pos: -39.5,-3.5 - parent: 31 - - uid: 11397 - components: - - type: Transform - pos: -39.5,-5.5 - parent: 31 - uid: 11647 components: - type: Transform @@ -78284,11 +78962,6 @@ entities: - type: Transform pos: 25.5,-25.5 parent: 31 - - uid: 1385 - components: - - type: Transform - pos: 25.5,-21.5 - parent: 31 - uid: 1655 components: - type: Transform @@ -78324,16 +78997,6 @@ entities: - type: Transform pos: 23.5,-22.5 parent: 31 - - uid: 3910 - components: - - type: Transform - pos: -27.5,15.5 - parent: 31 - - uid: 5005 - components: - - type: Transform - pos: 20.5,-22.5 - parent: 31 - uid: 5145 components: - type: Transform @@ -78359,16 +79022,6 @@ entities: - type: Transform pos: -31.5,-6.5 parent: 31 - - uid: 8854 - components: - - type: Transform - pos: 17.5,-23.5 - parent: 31 - - uid: 9013 - components: - - type: Transform - pos: 16.5,-23.5 - parent: 31 - uid: 9087 components: - type: Transform @@ -78379,11 +79032,6 @@ entities: - type: Transform pos: 4.5,-40.5 parent: 31 - - uid: 9596 - components: - - type: Transform - pos: 16.5,-20.5 - parent: 31 - uid: 9822 components: - type: Transform @@ -78414,16 +79062,6 @@ entities: - type: Transform pos: 2.5,-42.5 parent: 31 - - uid: 10417 - components: - - type: Transform - pos: -31.5,15.5 - parent: 31 - - uid: 10422 - components: - - type: Transform - pos: -30.5,15.5 - parent: 31 - uid: 10601 components: - type: Transform @@ -78441,13 +79079,6 @@ entities: - type: Transform pos: -25.5,-27.5 parent: 31 -- proto: WardrobeRoboticsFilled - entities: - - uid: 9616 - components: - - type: Transform - pos: -2.5,-25.5 - parent: 31 - proto: WarningCO2 entities: - uid: 11013 @@ -78668,6 +79299,11 @@ entities: - type: Transform pos: -21.5,-2.5 parent: 31 + - uid: 10781 + components: + - type: Transform + pos: 21.5,-7.5 + parent: 31 - proto: WaterTankHighCapacity entities: - uid: 10355 @@ -78694,6 +79330,18 @@ entities: - type: Transform pos: -2.5,7.5 parent: 31 + - uid: 10780 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,15.5 + parent: 31 + - uid: 10782 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,11.5 + parent: 31 - uid: 11117 components: - type: Transform @@ -78769,14 +79417,6 @@ entities: - type: Transform pos: 51.379066,17.2747 parent: 31 -- proto: WelderMini - entities: - - uid: 1309 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.758324,-20.712929 - parent: 31 - proto: WeldingFuelTankFull entities: - uid: 586 @@ -79056,6 +79696,18 @@ entities: rot: 3.141592653589793 rad pos: -1.5,6.5 parent: 31 + - uid: 10757 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,18.5 + parent: 31 + - uid: 10759 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,19.5 + parent: 31 - proto: Window entities: - uid: 261 @@ -79161,12 +79813,6 @@ entities: - type: Transform pos: 11.5,2.5 parent: 31 - - uid: 2155 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,11.5 - parent: 31 - uid: 2197 components: - type: Transform @@ -79196,6 +79842,12 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-14.5 parent: 31 + - uid: 3888 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,24.5 + parent: 31 - uid: 4069 components: - type: Transform @@ -79243,6 +79895,12 @@ entities: - type: Transform pos: 49.5,-6.5 parent: 31 + - uid: 6810 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,21.5 + parent: 31 - uid: 7438 components: - type: Transform @@ -79318,12 +79976,6 @@ entities: - type: Transform pos: 44.5,-8.5 parent: 31 - - uid: 10829 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,11.5 - parent: 31 - uid: 11715 components: - type: Transform @@ -79383,6 +80035,29 @@ entities: parent: 31 - proto: WindowReinforcedDirectional entities: + - uid: 60 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-45.5 + parent: 31 + - uid: 167 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,-15.5 + parent: 31 + - uid: 198 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-6.5 + parent: 31 + - uid: 422 + components: + - type: Transform + pos: -35.5,27.5 + parent: 31 - uid: 477 components: - type: Transform @@ -79400,6 +80075,23 @@ entities: - type: Transform pos: -8.5,38.5 parent: 31 + - uid: 546 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,16.5 + parent: 31 + - uid: 552 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-8.5 + parent: 31 + - uid: 1046 + components: + - type: Transform + pos: -37.5,27.5 + parent: 31 - uid: 1368 components: - type: Transform @@ -79452,6 +80144,17 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,35.5 parent: 31 + - uid: 2951 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,-13.5 + parent: 31 + - uid: 3475 + components: + - type: Transform + pos: 60.5,12.5 + parent: 31 - uid: 3784 components: - type: Transform @@ -79480,6 +80183,11 @@ entities: rot: 3.141592653589793 rad pos: 67.5,0.5 parent: 31 + - uid: 4244 + components: + - type: Transform + pos: 59.5,12.5 + parent: 31 - uid: 4256 components: - type: Transform @@ -79490,6 +80198,12 @@ entities: - type: Transform pos: -9.5,27.5 parent: 31 + - uid: 4343 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 42.5,-15.5 + parent: 31 - uid: 4392 components: - type: Transform @@ -79610,12 +80324,48 @@ entities: - type: Transform pos: 66.5,4.5 parent: 31 + - uid: 4915 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -38.5,16.5 + parent: 31 + - uid: 5005 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,15.5 + parent: 31 + - uid: 5988 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-23.5 + parent: 31 - uid: 6089 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,32.5 parent: 31 + - uid: 6402 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-31.5 + parent: 31 + - uid: 6511 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-10.5 + parent: 31 + - uid: 6651 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-45.5 + parent: 31 - uid: 6752 components: - type: Transform @@ -79700,6 +80450,12 @@ entities: - type: Transform pos: -6.5,38.5 parent: 31 + - uid: 7357 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-4.5 + parent: 31 - uid: 7426 components: - type: Transform @@ -79738,11 +80494,29 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,33.5 parent: 31 + - uid: 7636 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-41.5 + parent: 31 + - uid: 7785 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-13.5 + parent: 31 - uid: 7856 components: - type: Transform pos: -18.5,27.5 parent: 31 + - uid: 8039 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,16.5 + parent: 31 - uid: 8148 components: - type: Transform @@ -79760,6 +80534,108 @@ entities: rot: 1.5707963267948966 rad pos: 50.5,-15.5 parent: 31 + - uid: 8342 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,-31.5 + parent: 31 + - uid: 8343 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-41.5 + parent: 31 + - uid: 8354 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-41.5 + parent: 31 + - uid: 8355 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-46.5 + parent: 31 + - uid: 8356 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-46.5 + parent: 31 + - uid: 8374 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 44.5,-15.5 + parent: 31 + - uid: 8389 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-46.5 + parent: 31 + - uid: 8481 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-41.5 + parent: 31 + - uid: 8507 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-33.5 + parent: 31 + - uid: 8589 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-25.5 + parent: 31 + - uid: 8633 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,-13.5 + parent: 31 + - uid: 9185 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,17.5 + parent: 31 + - uid: 10030 + components: + - type: Transform + pos: 26.5,23.5 + parent: 31 + - uid: 10149 + components: + - type: Transform + pos: 27.5,23.5 + parent: 31 + - uid: 10153 + components: + - type: Transform + anchored: False + pos: 25.5,23.5 + parent: 31 + - type: Physics + bodyType: Dynamic + - uid: 10248 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -40.5,15.5 + parent: 31 + - uid: 10249 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -40.5,12.5 + parent: 31 - uid: 11143 components: - type: Transform @@ -79845,16 +80721,6 @@ entities: parent: 31 - proto: WoodDoor entities: - - uid: 186 - components: - - type: Transform - pos: -36.5,11.5 - parent: 31 - - uid: 297 - components: - - type: Transform - pos: -38.5,16.5 - parent: 31 - uid: 11481 components: - type: Transform @@ -79934,6 +80800,11 @@ entities: rot: -1.5707963267948966 rad pos: -30.371792,-9.595388 parent: 31 + - uid: 10751 + components: + - type: Transform + pos: -34.991947,23.959715 + parent: 31 - uid: 10984 components: - type: Transform From 2500a3912b512ca3663b47a7d9622dc887e3e8d5 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sun, 29 Dec 2024 01:51:56 +0000 Subject: [PATCH 04/18] Automatic Changelog Update (#1372) --- Resources/Changelog/Changelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1e832dea293..2e2c3a6acbb 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8797,3 +8797,10 @@ Entries: id: 6592 time: '2024-12-26T03:50:10.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1370 +- author: SiN Mapping Team + changes: + - type: Add + message: Another big update for Saltern + id: 6593 + time: '2024-12-29T01:51:30.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1372 From e1853c7250d0e655e3c0a7849d9503d5708cfdb9 Mon Sep 17 00:00:00 2001 From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Date: Sun, 29 Dec 2024 20:46:05 -0400 Subject: [PATCH 05/18] Remove Europa From Map Pool (#1380) # Description There are a _lot_ of issues surrounding Europa, which include, but the big two are: - How many complaints I'm receiving about it in general. - Engineering issues, including a lack of an alternative beyond an SM (supposedly) - Lacking a cryosleep area. - Distro air and waste are connected together. - More here https://github.com/Simple-Station/Einstein-Engines/issues/1379#issuecomment-2564303908 Is there a way we can add people to review maps specifically? I'm not a mapper, but the last few maps that have gotten through have been _bad_ at the start. --- # Changelog :cl: - remove: *Temporarily* removed Europa from map pool, pending some refurbishing. --- Resources/Prototypes/Maps/Pools/default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index 0745a2d9197..6db58e8b120 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -16,4 +16,4 @@ - TheHive - Gax - Rad - - Europa +# - Europa \ No newline at end of file From 8fd1a1009a347a3f12de7342e76e0995b5047401 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Mon, 30 Dec 2024 00:46:31 +0000 Subject: [PATCH 06/18] Automatic Changelog Update (#1380) --- Resources/Changelog/Changelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2e2c3a6acbb..c4f7cbca036 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8804,3 +8804,10 @@ Entries: id: 6593 time: '2024-12-29T01:51:30.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1372 +- author: sleepyyapril + changes: + - type: Remove + message: '*Temporarily* removed Europa from map pool, pending some refurbishing.' + id: 6594 + time: '2024-12-30T00:46:05.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1380 From 93446f1004396c6d86a109690f0033f983d95d3e Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Mon, 30 Dec 2024 03:10:53 +0100 Subject: [PATCH 07/18] Shadowkin Rework (#1200) # Description This PR compleatly rework shadowkins, slightly been forced this makes shadowkins more "psionic creature" then anything else. This is a WIP, but in general this PR make Shadowkin "Psionic" and fall under the same rule. RIP Shadowkin for me but ye. CHANGES TO SHADOWKINS: Shadowkins now follow the laws of psionic, they will always spawn with DarkSwapPower but can generate others power, they do not spawn with Shadeskip by default anymore, Mana has been lower from 250 to 200; they can now pick normal psionic jobs. Changes to DarkSwap: DarkSwap cost 30 Mana and will raise glimmer on use, its will drain 1 Mana/Sec, will eject the user when mana is fully drained. DarkSwap is now a random roll. Changes to Psionics: Added the Mana Alert for all psionics --- # TODO - [x] Psionic Mana Alert - [x] DarkSwap Rework - [x] Remove Unique Shadowkin Psionic Changes - [x] Import bugs fixes/QOL changes. ---

Media

N/A

--- # Changelog :cl: - tweak: Shadowkins has returned and has been reworked. - add: DarkSwap is now in the Psionic Power Pool. - tweak: Psionics can now see their mana pools. --------- Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> --- .../Psionics/Abilities/DarkSwapSystem.cs | 8 ++- Content.Server/Alert/Click/CheckMana.cs | 38 +++++++++++ Content.Server/Psionics/PsionicsSystem.cs | 20 ++++++ .../Shadowkin/EtherealStunItemSystem.cs | 3 +- Content.Server/Shadowkin/EtherealSystem.cs | 7 +-- .../Shadowkin/ShadowkinCuffSystem.cs | 29 --------- Content.Server/Shadowkin/ShadowkinSystem.cs | 59 ++---------------- Content.Shared/Psionics/PsionicComponent.cs | 7 ++- .../Psionics/SharedPsionicAbilitiesSystem.cs | 6 +- Content.Shared/Shadowkin/EtherealComponent.cs | 12 +++- .../Shadowkin/ShadowkinComponent.cs | 17 +---- .../Shadowkin/ShadowkinCuffComponent.cs | 4 -- .../Shadowkin/SharedEtherealSystem.cs | 42 ++++++++++++- Resources/Locale/en-US/alerts/alerts.ftl | 4 ++ Resources/Locale/en-US/alerts/shadowkin.ftl | 2 - .../Locale/en-US/psionics/psionic-powers.ftl | 6 +- Resources/Locale/en-US/species/shadowkin.ftl | 3 +- Resources/Prototypes/Actions/psionics.yml | 37 +---------- Resources/Prototypes/Alerts/alerts.yml | 27 +++++++- Resources/Prototypes/Alerts/shadowkin.yml | 23 ------- .../Entities/Clothing/OuterClothing/misc.yml | 31 +++++---- .../Entities/Mobs/Species/shadowkin.yml | 7 +-- .../Entities/Structures/Machines/lathe.yml | 1 - .../Roles/Jobs/Epistemics/forensicmantis.yml | 5 +- .../PsionicPowerPool.yml} | 1 + Resources/Prototypes/Psionics/psionics.yml | 4 +- .../Prototypes/Recipes/Lathes/security.yml | 7 --- .../Roles/Jobs/Science/research_director.yml | 5 +- Resources/Prototypes/Species/shadowkin.yml | 2 +- Resources/Prototypes/Traits/mental.yml | 45 ++++++++++--- Resources/Prototypes/Traits/skills.yml | 5 +- .../meta.json | 0 .../power0.png | Bin .../power1.png | Bin .../power2.png | Bin .../power3.png | Bin .../power4.png | Bin .../power5.png | Bin .../power6.png | Bin .../power7.png | Bin 40 files changed, 241 insertions(+), 226 deletions(-) create mode 100644 Content.Server/Alert/Click/CheckMana.cs delete mode 100644 Content.Server/Shadowkin/ShadowkinCuffSystem.cs delete mode 100644 Content.Shared/Shadowkin/ShadowkinCuffComponent.cs delete mode 100644 Resources/Locale/en-US/alerts/shadowkin.ftl delete mode 100644 Resources/Prototypes/Alerts/shadowkin.yml rename Resources/Prototypes/{Nyanotrasen/psionicPowers.yml => Psionics/PsionicPowerPool.yml} (95%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/meta.json (100%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/power0.png (100%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/power1.png (100%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/power2.png (100%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/power3.png (100%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/power4.png (100%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/power5.png (100%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/power6.png (100%) rename Resources/Textures/Interface/Alerts/{shadowkin_power.rsi => mana.rsi}/power7.png (100%) diff --git a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs index fd394e0a228..a3ea3f5c824 100644 --- a/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs +++ b/Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs @@ -32,13 +32,15 @@ private void OnPowerUsed(DarkSwapActionEvent args) return; } - if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost / 2, args.CheckInsulation)) + if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap")) { + SpawnAtPosition("ShadowkinShadow", Transform(args.Performer).Coordinates); + SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(args.Performer).Coordinates); RemComp(args.Performer, ethereal); args.Handled = true; } } - else if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost, args.CheckInsulation)) + else if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost)) { var newethereal = EnsureComp(args.Performer); newethereal.Darken = true; @@ -50,7 +52,7 @@ private void OnPowerUsed(DarkSwapActionEvent args) } if (args.Handled) - _psionics.LogPowerUsed(args.Performer, "DarkSwap", 0, 0); + _psionics.LogPowerUsed(args.Performer, "DarkSwap"); } } } diff --git a/Content.Server/Alert/Click/CheckMana.cs b/Content.Server/Alert/Click/CheckMana.cs new file mode 100644 index 00000000000..40661af5549 --- /dev/null +++ b/Content.Server/Alert/Click/CheckMana.cs @@ -0,0 +1,38 @@ +using Content.Server.Chat.Managers; +using Content.Shared.Abilities.Psionics; +using Content.Shared.Alert; +using Content.Shared.Chat; +using JetBrains.Annotations; +using Robust.Server.Player; +using Robust.Shared.Player; + +namespace Content.Server.Alert.Click; + +[UsedImplicitly] +[DataDefinition] +public sealed partial class CheckMana : IAlertClick +{ + public void AlertClicked(EntityUid player) + { + var chatManager = IoCManager.Resolve(); + var entityManager = IoCManager.Resolve(); + var playerManager = IoCManager.Resolve(); + + if (!entityManager.TryGetComponent(player, out PsionicComponent? magic) || + !playerManager.TryGetSessionByEntity(player, out var session)) + return; + + var baseMsg = Loc.GetString("mana-alert", ("mana", magic.Mana), ("manaMax", magic.MaxMana)); + SendMessage(chatManager, baseMsg, session); + } + + private static void SendMessage(IChatManager chatManager, string msg, ICommonSession session) + { + chatManager.ChatMessageToOne(ChatChannel.Emotes, + msg, + msg, + EntityUid.Invalid, + false, + session.Channel); + } +} diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs index 9685334daba..5f43e730ad4 100644 --- a/Content.Server/Psionics/PsionicsSystem.cs +++ b/Content.Server/Psionics/PsionicsSystem.cs @@ -19,6 +19,9 @@ using Content.Shared.Mobs; using Content.Shared.Damage; using Content.Shared.Interaction.Events; +using Content.Shared.Alert; +using Content.Shared.Rounding; +using Content.Shared.Psionics; namespace Content.Server.Psionics; @@ -39,6 +42,7 @@ public sealed class PsionicsSystem : EntitySystem [Dependency] private readonly IPrototypeManager _protoMan = default!; [Dependency] private readonly PsionicFamiliarSystem _psionicFamiliar = default!; [Dependency] private readonly NPCRetaliationSystem _retaliationSystem = default!; + [Dependency] private readonly AlertsSystem _alerts = default!; private const string BaselineAmplification = "Baseline Amplification"; private const string BaselineDampening = "Baseline Dampening"; @@ -71,6 +75,7 @@ public override void Initialize() SubscribeLocalEvent(OnMobstateChanged); SubscribeLocalEvent(OnDamageChanged); SubscribeLocalEvent(OnAttackAttempt); + SubscribeLocalEvent(OnManaUpdate); SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnRemove); @@ -135,6 +140,8 @@ private void CheckAntiPsionic(EntityUid entity, AntiPsionicWeaponComponent compo private void OnInit(EntityUid uid, PsionicComponent component, ComponentStartup args) { + UpdateManaAlert(uid, component); + component.AmplificationSources.Add(BaselineAmplification, _random.NextFloat(component.BaselineAmplification.Item1, component.BaselineAmplification.Item2)); component.DampeningSources.Add(BaselineDampening, _random.NextFloat(component.BaselineDampening.Item1, component.BaselineDampening.Item2)); @@ -148,12 +155,25 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentStartup private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args) { + _alerts.ClearAlert(uid, component.ManaAlert); + if (!HasComp(uid)) return; _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper"); } + public void UpdateManaAlert(EntityUid uid, PsionicComponent component) + { + var severity = (short) ContentHelpers.RoundToLevels(component.Mana, component.MaxMana, 8); + _alerts.ShowAlert(uid, component.ManaAlert, severity); + } + + private void OnManaUpdate(EntityUid uid, PsionicComponent component, ref OnManaUpdateEvent args) + { + UpdateManaAlert(uid, component); + } + private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, TakeStaminaDamageEvent args) { if (!HasComp(args.Target)) diff --git a/Content.Server/Shadowkin/EtherealStunItemSystem.cs b/Content.Server/Shadowkin/EtherealStunItemSystem.cs index b48b4d4fecf..f7f735a0525 100644 --- a/Content.Server/Shadowkin/EtherealStunItemSystem.cs +++ b/Content.Server/Shadowkin/EtherealStunItemSystem.cs @@ -21,7 +21,8 @@ private void OnUseInHand(EntityUid uid, EtherealStunItemComponent component, Use { foreach (var ent in _lookup.GetEntitiesInRange(uid, component.Radius)) { - if (!TryComp(ent, out var ethereal)) + if (!TryComp(ent, out var ethereal) + || !ethereal.CanBeStunned) continue; RemComp(ent, ethereal); diff --git a/Content.Server/Shadowkin/EtherealSystem.cs b/Content.Server/Shadowkin/EtherealSystem.cs index 2622547a3f6..4ff0654dfb2 100644 --- a/Content.Server/Shadowkin/EtherealSystem.cs +++ b/Content.Server/Shadowkin/EtherealSystem.cs @@ -79,9 +79,6 @@ public override void OnShutdown(EntityUid uid, EtherealComponent component, Comp RemComp(uid); RemComp(uid); - SpawnAtPosition("ShadowkinShadow", Transform(uid).Coordinates); - SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(uid).Coordinates); - foreach (var light in component.DarkenedLights.ToArray()) { if (!TryComp(light, out var pointLight) @@ -181,7 +178,7 @@ public override void Update(float frameTime) if (etherealLight.AttachedEntity == uid && _random.Prob(0.03f)) - etherealLight.AttachedEntity = EntityUid.Invalid; + etherealLight.AttachedEntity = EntityUid.Invalid; if (!etherealLight.OldRadiusEdited) { @@ -213,4 +210,4 @@ public override void Update(float frameTime) } } } -} \ No newline at end of file +} diff --git a/Content.Server/Shadowkin/ShadowkinCuffSystem.cs b/Content.Server/Shadowkin/ShadowkinCuffSystem.cs deleted file mode 100644 index ce2b2588174..00000000000 --- a/Content.Server/Shadowkin/ShadowkinCuffSystem.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Content.Shared.Inventory.Events; -using Content.Shared.Clothing.Components; -using Content.Shared.Shadowkin; - -namespace Content.Server.Shadowkin; - -public sealed class ShadowkinCuffSystem : EntitySystem -{ - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnEquipped); - SubscribeLocalEvent(OnUnequipped); - } - - private void OnEquipped(EntityUid uid, ShadowkinCuffComponent component, GotEquippedEvent args) - { - if (!TryComp(uid, out var clothing) - || !clothing.Slots.HasFlag(args.SlotFlags)) - return; - - EnsureComp(args.Equipee); - } - - private void OnUnequipped(EntityUid uid, ShadowkinCuffComponent component, GotUnequippedEvent args) - { - RemComp(args.Equipee); - } -} \ No newline at end of file diff --git a/Content.Server/Shadowkin/ShadowkinSystem.cs b/Content.Server/Shadowkin/ShadowkinSystem.cs index 96bd09db276..b2b80191898 100644 --- a/Content.Server/Shadowkin/ShadowkinSystem.cs +++ b/Content.Server/Shadowkin/ShadowkinSystem.cs @@ -30,7 +30,6 @@ public override void Initialize() SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnExamined); SubscribeLocalEvent(OnMindbreak); - SubscribeLocalEvent(OnAttemptPowerUse); SubscribeLocalEvent(OnManaUpdate); SubscribeLocalEvent(OnRejuvenate); SubscribeLocalEvent(OnEyeColorChange); @@ -38,18 +37,12 @@ public override void Initialize() private void OnInit(EntityUid uid, ShadowkinComponent component, ComponentStartup args) { - if (component.BlackeyeSpawn) - ApplyBlackEye(uid); - _actionsSystem.AddAction(uid, ref component.ShadowkinSleepAction, ShadowkinSleepActionId, uid); - - UpdateShadowkinAlert(uid, component); } private void OnEyeColorChange(EntityUid uid, ShadowkinComponent component, EyeColorInitEvent args) { if (!TryComp(uid, out var humanoid) - || !component.BlackeyeSpawn || humanoid.EyeColor == component.OldEyeColor) return; @@ -81,26 +74,6 @@ private void OnExamined(EntityUid uid, ShadowkinComponent component, ExaminedEve )); } - /// - /// Update the Shadowkin Alert, if Blackeye will remove the Alert, if not will update to its current power status. - /// - public void UpdateShadowkinAlert(EntityUid uid, ShadowkinComponent component) - { - if (TryComp(uid, out var magic)) - { - var severity = (short) ContentHelpers.RoundToLevels(magic.Mana, magic.MaxMana, 8); - _alerts.ShowAlert(uid, component.ShadowkinPowerAlert, severity); - } - else - _alerts.ClearAlert(uid, component.ShadowkinPowerAlert); - } - - private void OnAttemptPowerUse(EntityUid uid, ShadowkinComponent component, OnAttemptPowerUseEvent args) - { - if (HasComp(uid)) - args.Cancel(); - } - private void OnManaUpdate(EntityUid uid, ShadowkinComponent component, ref OnManaUpdateEvent args) { if (!TryComp(uid, out var magic)) @@ -112,24 +85,7 @@ private void OnManaUpdate(EntityUid uid, ShadowkinComponent component, ref OnMan else magic.ManaGainMultiplier = 1; - if (magic.Mana <= component.BlackEyeMana) - ApplyBlackEye(uid); - Dirty(uid, magic); // Update Shadowkin Overlay. - UpdateShadowkinAlert(uid, component); - } - - /// - /// Blackeye the Shadowkin, its just a function to mindbreak the shadowkin but making sure "Removable" is checked true during it. - /// - /// - public void ApplyBlackEye(EntityUid uid) - { - if (!TryComp(uid, out var magic)) - return; - - magic.Removable = true; - _psionicAbilitiesSystem.MindBreak(uid); } private void OnMindbreak(EntityUid uid, ShadowkinComponent component, ref OnMindbreakEvent args) @@ -144,17 +100,13 @@ private void OnMindbreak(EntityUid uid, ShadowkinComponent component, ref OnMind Dirty(uid, humanoid); } - if (component.BlackeyeSpawn) - return; - if (TryComp(uid, out var stamina)) _stamina.TakeStaminaDamage(uid, stamina.CritThreshold, stamina, uid); } private void OnRejuvenate(EntityUid uid, ShadowkinComponent component, RejuvenateEvent args) { - if (component.BlackeyeSpawn - || !HasComp(uid)) + if (!HasComp(uid)) return; RemComp(uid); @@ -166,16 +118,13 @@ private void OnRejuvenate(EntityUid uid, ShadowkinComponent component, Rejuvenat } EnsureComp(uid, out var magic); - magic.Mana = 250; - magic.MaxMana = 250; + magic.Mana = 200; + magic.MaxMana = 200; magic.ManaGain = 0.25f; - magic.BypassManaCheck = true; - magic.Removable = false; magic.MindbreakingFeedback = "shadowkin-blackeye"; + magic.NoMana = "shadowkin-tired"; if (_prototypeManager.TryIndex("ShadowkinPowers", out var shadowkinPowers)) _psionicAbilitiesSystem.InitializePsionicPower(uid, shadowkinPowers); - - UpdateShadowkinAlert(uid, component); } } diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs index 16e0f028de0..299dc71340b 100644 --- a/Content.Shared/Psionics/PsionicComponent.cs +++ b/Content.Shared/Psionics/PsionicComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Alert; using Content.Shared.DoAfter; using Content.Shared.Psionics; using Robust.Shared.GameStates; @@ -12,7 +13,7 @@ public sealed partial class PsionicComponent : Component /// Current Mana. /// [DataField, AutoNetworkedField] - public float Mana; + public float Mana = 50; /// /// Max Mana Possible. @@ -212,6 +213,7 @@ private set public string AlreadyCasting = "already-casting"; /// Popup to play if there no Mana left for a power to execute. + [DataField] public string NoMana = "no-mana"; /// @@ -225,5 +227,8 @@ private set /// [DataField] public int FamiliarLimit = 1; + + [DataField] + public ProtoId ManaAlert = "Mana"; } } diff --git a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs index b79dabbc416..33d8807f4b2 100644 --- a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs +++ b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs @@ -147,7 +147,8 @@ public override void Update(float frameTime) var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var component)) { - if (_mobState.IsDead(uid)) + if (_mobState.IsDead(uid) + || HasComp(uid)) continue; component.ManaAccumulator += frameTime; @@ -160,6 +161,9 @@ public override void Update(float frameTime) if (component.Mana > component.MaxMana) component.Mana = component.MaxMana; + if (component.Mana < 0) + component.Mana = 0; + if (component.Mana < component.MaxMana) { var gainedmana = component.ManaGain * component.ManaGainMultiplier; diff --git a/Content.Shared/Shadowkin/EtherealComponent.cs b/Content.Shared/Shadowkin/EtherealComponent.cs index 0fc50c0f12e..113f90df8e6 100644 --- a/Content.Shared/Shadowkin/EtherealComponent.cs +++ b/Content.Shared/Shadowkin/EtherealComponent.cs @@ -23,8 +23,18 @@ public sealed partial class EtherealComponent : Component [DataField] public float DarkenRate = 0.084f; + /// Can this be stunned by ethereal stun objects? + [DataField] + public bool CanBeStunned = true; + + /// Drain Mana if this entity is psionic? + [DataField] + public bool DrainMana = true; + public List DarkenedLights = new(); + public float OldManaGain; + public float DarkenAccumulator; public int OldMobMask; @@ -33,4 +43,4 @@ public sealed partial class EtherealComponent : Component public List SuppressedFactions = new(); public bool HasDoorBumpTag; -} \ No newline at end of file +} diff --git a/Content.Shared/Shadowkin/ShadowkinComponent.cs b/Content.Shared/Shadowkin/ShadowkinComponent.cs index a2a4fdf334f..1c9f458996e 100644 --- a/Content.Shared/Shadowkin/ShadowkinComponent.cs +++ b/Content.Shared/Shadowkin/ShadowkinComponent.cs @@ -19,18 +19,6 @@ public sealed partial class ShadowkinComponent : Component [DataField] public float SleepManaRegenMultiplier = 4; - /// - /// On MapInitEvent, will Blackeye the Shadowkin. - /// - [DataField] - public bool BlackeyeSpawn; - - /// - /// If mana is equal or lower then this value, blackeye the shadowkin. - /// - [DataField] - public float BlackEyeMana; - /// /// Set the Black-Eye Color. /// @@ -41,7 +29,4 @@ public sealed partial class ShadowkinComponent : Component [DataField] public EntityUid? ShadowkinSleepAction; - - [DataField] - public ProtoId ShadowkinPowerAlert = "ShadowkinPower"; -} \ No newline at end of file +} diff --git a/Content.Shared/Shadowkin/ShadowkinCuffComponent.cs b/Content.Shared/Shadowkin/ShadowkinCuffComponent.cs deleted file mode 100644 index b4c62d66647..00000000000 --- a/Content.Shared/Shadowkin/ShadowkinCuffComponent.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace Content.Shared.Shadowkin; - -[RegisterComponent] -public sealed partial class ShadowkinCuffComponent : Component { } \ No newline at end of file diff --git a/Content.Shared/Shadowkin/SharedEtherealSystem.cs b/Content.Shared/Shadowkin/SharedEtherealSystem.cs index 66196faf0a3..4d9a5e47b0d 100644 --- a/Content.Shared/Shadowkin/SharedEtherealSystem.cs +++ b/Content.Shared/Shadowkin/SharedEtherealSystem.cs @@ -14,6 +14,8 @@ using Robust.Shared.Configuration; using Content.Shared.Abilities.Psionics; using Content.Shared.Tag; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; namespace Content.Shared.Shadowkin; @@ -24,6 +26,7 @@ public abstract class SharedEtherealSystem : EntitySystem [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private readonly StaminaSystem _stamina = default!; public override void Initialize() { @@ -38,10 +41,18 @@ public override void Initialize() SubscribeLocalEvent(OnShootAttempt); SubscribeLocalEvent(OnMindbreak); SubscribeLocalEvent(OnMobStateChanged); + SubscribeLocalEvent(OnManaUpdate); } public virtual void OnStartup(EntityUid uid, EtherealComponent component, MapInitEvent args) { + if (TryComp(uid, out var magic) + && component.DrainMana) + { + component.OldManaGain = magic.ManaGain; + magic.ManaGain = -1; + } + if (!TryComp(uid, out var fixtures)) return; @@ -67,6 +78,10 @@ public virtual void OnStartup(EntityUid uid, EtherealComponent component, MapIni public virtual void OnShutdown(EntityUid uid, EtherealComponent component, ComponentShutdown args) { + if (TryComp(uid, out var magic) + && component.DrainMana) + magic.ManaGain = component.OldManaGain; + if (!TryComp(uid, out var fixtures)) return; @@ -75,12 +90,31 @@ public virtual void OnShutdown(EntityUid uid, EtherealComponent component, Compo _physics.SetCollisionMask(uid, fixture.Key, fixture.Value, component.OldMobMask, fixtures); _physics.SetCollisionLayer(uid, fixture.Key, fixture.Value, component.OldMobLayer, fixtures); - if (component.HasDoorBumpTag) - _tag.AddTag(uid, "DoorBumpOpener"); + if (_cfg.GetCVar(CCVars.EtherealPassThrough)) + if (component.HasDoorBumpTag) + _tag.AddTag(uid, "DoorBumpOpener"); + } + + private void OnManaUpdate(EntityUid uid, EtherealComponent component, ref OnManaUpdateEvent args) + { + if (!TryComp(uid, out var magic)) + return; + + if (magic.Mana <= 0) + { + if (TryComp(uid, out var stamina)) + _stamina.TakeStaminaDamage(uid, stamina.CritThreshold, stamina, uid); + + SpawnAtPosition("ShadowkinShadow", Transform(uid).Coordinates); + SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(uid).Coordinates); + RemComp(uid, component); + } } private void OnMindbreak(EntityUid uid, EtherealComponent component, ref OnMindbreakEvent args) { + SpawnAtPosition("ShadowkinShadow", Transform(uid).Coordinates); + SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(uid).Coordinates); RemComp(uid, component); } @@ -88,7 +122,11 @@ private void OnMobStateChanged(EntityUid uid, EtherealComponent component, MobSt { if (args.NewMobState == MobState.Critical || args.NewMobState == MobState.Dead) + { + SpawnAtPosition("ShadowkinShadow", Transform(uid).Coordinates); + SpawnAtPosition("EffectFlashShadowkinDarkSwapOff", Transform(uid).Coordinates); RemComp(uid, component); + } } private void OnShootAttempt(Entity ent, ref ShotAttemptedEvent args) diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl index ad61ae89674..b9d3b6269dc 100644 --- a/Resources/Locale/en-US/alerts/alerts.ftl +++ b/Resources/Locale/en-US/alerts/alerts.ftl @@ -116,3 +116,7 @@ alerts-offer-desc = Someone offers you an item. alerts-deflecting-name = Deflecting alerts-deflecting-desc = You have a chance to deflect incoming projectiles. Standing still or moving slowly will increase this chance. + +alerts-mana-name = Mana Level +alerts-mana-desc = How much mana is available to spend on your powers. +mana-alert = [font size=12][color=purple]Mana: {$mana}/{$manaMax}[/color][/font] diff --git a/Resources/Locale/en-US/alerts/shadowkin.ftl b/Resources/Locale/en-US/alerts/shadowkin.ftl deleted file mode 100644 index 10f8438b76c..00000000000 --- a/Resources/Locale/en-US/alerts/shadowkin.ftl +++ /dev/null @@ -1,2 +0,0 @@ -alerts-shadowkin-power-name = Power Level -alerts-shadowkin-power-desc = How much energy is available to spend on Shadowkin powers. \ No newline at end of file diff --git a/Resources/Locale/en-US/psionics/psionic-powers.ftl b/Resources/Locale/en-US/psionics/psionic-powers.ftl index a7cec77aa2a..ae3cfb383ed 100644 --- a/Resources/Locale/en-US/psionics/psionic-powers.ftl +++ b/Resources/Locale/en-US/psionics/psionic-powers.ftl @@ -167,13 +167,11 @@ psionic-roll-failed = For a moment, my consciousness expands, yet I feel that it entity-anomaly-no-grid = There is nowhere for me to conjure beings. power-overwhelming-power-feedback = {CAPITALIZE($entity)} wields a vast connection to the noösphere -# Shadowkin ShadeSkip -action-description-shadowkin-shadeskip = Aaramrra! - # DarkSwap action-name-darkswap = DarkSwap action-description-darkswap = Mmra Mamm! - +darkswap-power-initialization-feedback = + For a short moment, I find myself able to break the realms. Phasing in the shadows and the dark, ready to travel to the darkest of places... ethereal-pickup-fail = My hand sizzles as it passes through... # Psionic Familiar System diff --git a/Resources/Locale/en-US/species/shadowkin.ftl b/Resources/Locale/en-US/species/shadowkin.ftl index ebc56487b7a..b0c282df752 100644 --- a/Resources/Locale/en-US/species/shadowkin.ftl +++ b/Resources/Locale/en-US/species/shadowkin.ftl @@ -12,4 +12,5 @@ examine-mindbroken-shadowkin-message = {CAPITALIZE($entity)} seems to be a black identity-eye-shadowkin = {$color}-eye -shadowkin-blackeye = I feel my power draining away... \ No newline at end of file +shadowkin-blackeye = I feel my power draining away... +shadowkin-tired = Im too tired! diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml index c5df4f70ad0..c6d9e17c2ac 100644 --- a/Resources/Prototypes/Actions/psionics.yml +++ b/Resources/Prototypes/Actions/psionics.yml @@ -291,40 +291,6 @@ maxThrowStrength: 5 spaceRange: 3 -- type: entity - id: ActionShadowkinShadeskip - name: action-name-shadeskip - description: action-description-shadowkin-shadeskip - categories: [ HideSpawnMenu ] - components: - - type: InstantAction - icon: { sprite: Interface/Actions/shadowkin_icons.rsi, state: shadeskip } - useDelay: 10 - checkCanInteract: false - event: !type:AnomalyPowerActionEvent - settings: - powerName: "Shadowkin-Shadeskip" - manaCost: 25 - checkInsulation: false - minGlimmer: 0 - maxGlimmer: 0 - doSupercritical: false - entitySpawnEntries: - - settings: - spawnOnPulse: true - minAmount: 5 - maxAmount: 10 - maxRange: 2.5 - spawns: - - ShadowkinShadow - - settings: - spawnOnPulse: true - minAmount: 1 - maxAmount: 1 - maxRange: 0.5 - spawns: - - EffectFlashShadowkinShadeskip - - type: entity id: ActionDarkSwap name: action-name-darkswap @@ -336,8 +302,7 @@ useDelay: 10 checkCanInteract: false event: !type:DarkSwapActionEvent - manaCost: 100 - checkInsulation: false + manaCost: 30 - type: entity id: ActionPyrokineticFlare diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index dffebf4b1dd..449f40a2123 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -7,7 +7,7 @@ - category: Health - category: Mood - category: Stamina - - alertType: ShadowkinPower + - alertType: Mana - alertType: SuitPower - category: Internals - alertType: Fire @@ -619,3 +619,28 @@ state: deflecting0 name: alerts-deflecting-name description: alerts-deflecting-desc + +- type: alert + id: Mana + onClick: !type:CheckMana { } + icons: + - sprite: /Textures/Interface/Alerts/mana.rsi + state: power0 + - sprite: /Textures/Interface/Alerts/mana.rsi + state: power1 + - sprite: /Textures/Interface/Alerts/mana.rsi + state: power2 + - sprite: /Textures/Interface/Alerts/mana.rsi + state: power3 + - sprite: /Textures/Interface/Alerts/mana.rsi + state: power4 + - sprite: /Textures/Interface/Alerts/mana.rsi + state: power5 + - sprite: /Textures/Interface/Alerts/mana.rsi + state: power6 + - sprite: /Textures/Interface/Alerts/mana.rsi + state: power7 + name: alerts-mana-name + description: alerts-mana-desc + minSeverity: 0 + maxSeverity: 7 diff --git a/Resources/Prototypes/Alerts/shadowkin.yml b/Resources/Prototypes/Alerts/shadowkin.yml deleted file mode 100644 index 66d41351bab..00000000000 --- a/Resources/Prototypes/Alerts/shadowkin.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: alert - id: ShadowkinPower - icons: - - sprite: /Textures/Interface/Alerts/shadowkin_power.rsi - state: power0 - - sprite: /Textures/Interface/Alerts/shadowkin_power.rsi - state: power1 - - sprite: /Textures/Interface/Alerts/shadowkin_power.rsi - state: power2 - - sprite: /Textures/Interface/Alerts/shadowkin_power.rsi - state: power3 - - sprite: /Textures/Interface/Alerts/shadowkin_power.rsi - state: power4 - - sprite: /Textures/Interface/Alerts/shadowkin_power.rsi - state: power5 - - sprite: /Textures/Interface/Alerts/shadowkin_power.rsi - state: power6 - - sprite: /Textures/Interface/Alerts/shadowkin_power.rsi - state: power7 - name: alerts-shadowkin-power-name - description: alerts-shadowkin-power-desc - minSeverity: 0 - maxSeverity: 7 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index b5169a9cf6b..ed764485727 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -429,19 +429,18 @@ - type: Clothing sprite: Clothing/OuterClothing/Misc/unathirobe.rsi -- type: entity - parent: ClothingOuterBase - id: ClothingOuterShadowkinRestraints - name: shadowkin restraints - description: One of the first creations after finding Shadowkin, these were used to contain the Shadowkin during research so they didn't teleport away. - components: - - type: Sprite - sprite: Clothing/OuterClothing/Misc/shadowkinrestraints.rsi - - type: Clothing - sprite: Clothing/OuterClothing/Misc/shadowkinrestraints.rsi - equipDelay: 0.5 - unequipDelay: 10 - - type: ShadowkinCuff - - type: GuideHelp - guides: - - Shadowkin \ No newline at end of file +# - type: entity # TODO: There no use for it now... but pehaps we could turn it into a Anti-Psionic Clothing like headcage? +# parent: ClothingOuterBase +# id: ClothingOuterShadowkinRestraints +# name: shadowkin restraints +# description: One of the first creations after finding Shadowkin, these were used to contain the Shadowkin during research so they didn't teleport away. +# components: +# - type: Sprite +# sprite: Clothing/OuterClothing/Misc/shadowkinrestraints.rsi +# - type: Clothing +# sprite: Clothing/OuterClothing/Misc/shadowkinrestraints.rsi +# equipDelay: 0.5 +# unequipDelay: 10 +# - type: GuideHelp +# guides: +# - Shadowkin diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index ff6edb49cc2..a0694465b55 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -224,10 +224,9 @@ - type: Psionic mindbreakingFeedback: shadowkin-blackeye manaGain: 0.25 - mana: 150 - maxMana: 250 - bypassManaCheck: true - removable: false + mana: 100 + maxMana: 200 + noMana: shadowkin-tired - type: InnatePsionicPowers powersToAdd: - ShadowkinPowers diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 27717049050..625285e707c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -817,7 +817,6 @@ - WeaponLaserCarbinePractice - Zipties - ShockCollar - - ShadowkinRestraints # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab - MagazineBoxSpecial - MagazineBoxSpecialPractice diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index 3834c3b95c4..6c8e1d77151 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -21,9 +21,12 @@ - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement - inverted: true species: - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye startingGear: ForensicMantisGear icon: "JobIconForensicMantis" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Psionics/PsionicPowerPool.yml similarity index 95% rename from Resources/Prototypes/Nyanotrasen/psionicPowers.yml rename to Resources/Prototypes/Psionics/PsionicPowerPool.yml index 8b2911018f9..a5cfccbbae5 100644 --- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml +++ b/Resources/Prototypes/Psionics/PsionicPowerPool.yml @@ -17,3 +17,4 @@ TelekineticPulsePower: 0.15 PyrokineticFlare: 0.3 SummonImpPower: 0.15 + DarkSwapPower: 0.1 diff --git a/Resources/Prototypes/Psionics/psionics.yml b/Resources/Prototypes/Psionics/psionics.yml index 7ee6e193e37..9b526665851 100644 --- a/Resources/Prototypes/Psionics/psionics.yml +++ b/Resources/Prototypes/Psionics/psionics.yml @@ -224,9 +224,8 @@ name: Shadowkin Powers description: shadowkin-powers-description actions: - - ActionShadowkinShadeskip - ActionDarkSwap - powerSlotCost: 1 + powerSlotCost: 0 - type: psionicPower id: EtherealVisionPower @@ -243,6 +242,7 @@ actions: - ActionDarkSwap powerSlotCost: 1 + initializationFeedback: darkswap-power-initialization-feedback - type: psionicPower id: PyrokineticFlare diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 594e6fcdb6f..e1c1b9a5fe0 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -882,13 +882,6 @@ Plastic: 15 Uranium: 10 -- type: latheRecipe - id: ShadowkinRestraints - result: ClothingOuterShadowkinRestraints - completetime: 6 - materials: - Steel: 300 - - type: latheRecipe id: SecurityCyberneticEyes result: SecurityCyberneticEyes diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 4fc9325f39d..bf8a83c7e8d 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -22,9 +22,12 @@ - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement - inverted: true species: - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml index f7674e80d61..7cbd752092f 100644 --- a/Resources/Prototypes/Species/shadowkin.yml +++ b/Resources/Prototypes/Species/shadowkin.yml @@ -1,7 +1,7 @@ - type: species id: Shadowkin name: species-name-shadowkin - roundStart: false + roundStart: true prototype: MobShadowkin sprites: MobShadowkinSprites defaultSkinTone: "#FFFFFF" diff --git a/Resources/Prototypes/Traits/mental.yml b/Resources/Prototypes/Traits/mental.yml index 4d52c528241..4dec0350f45 100644 --- a/Resources/Prototypes/Traits/mental.yml +++ b/Resources/Prototypes/Traits/mental.yml @@ -23,11 +23,19 @@ - !type:CharacterTraitRequirement traits: - AnomalousPositronics + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye - !type:CharacterSpeciesRequirement inverted: true species: - Oni - - Shadowkin - !type:CharacterTraitRequirement inverted: true traits: @@ -63,11 +71,19 @@ - !type:CharacterTraitRequirement traits: - AnomalousPositronics + - !type:CharacterLogicOrRequirement + requirements: + - !type:CharacterSpeciesRequirement + species: + - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye - !type:CharacterSpeciesRequirement inverted: true species: - Oni - - Shadowkin - !type:CharacterTraitRequirement inverted: true traits: @@ -106,9 +122,12 @@ - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement - inverted: true species: - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye - !type:CharacterTraitRequirement inverted: true traits: @@ -147,9 +166,12 @@ - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement - inverted: true species: - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye - !type:CharacterTraitRequirement inverted: true traits: @@ -188,9 +210,12 @@ - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement - inverted: true species: - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye - !type:CharacterTraitRequirement inverted: true traits: @@ -229,9 +254,12 @@ - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement - inverted: true species: - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye - !type:CharacterTraitRequirement inverted: true traits: @@ -269,9 +297,12 @@ - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement - inverted: true species: - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye - !type:CharacterTraitRequirement inverted: true traits: diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml index 2306d254ed5..949b12a7aec 100644 --- a/Resources/Prototypes/Traits/skills.yml +++ b/Resources/Prototypes/Traits/skills.yml @@ -291,9 +291,12 @@ - !type:CharacterLogicOrRequirement requirements: - !type:CharacterSpeciesRequirement - inverted: true species: - Shadowkin + - !type:CharacterTraitRequirement + inverted: true + traits: + - ShadowkinBlackeye - type: trait id: TrapAvoider diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/meta.json b/Resources/Textures/Interface/Alerts/mana.rsi/meta.json similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/meta.json rename to Resources/Textures/Interface/Alerts/mana.rsi/meta.json diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power0.png b/Resources/Textures/Interface/Alerts/mana.rsi/power0.png similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power0.png rename to Resources/Textures/Interface/Alerts/mana.rsi/power0.png diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power1.png b/Resources/Textures/Interface/Alerts/mana.rsi/power1.png similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power1.png rename to Resources/Textures/Interface/Alerts/mana.rsi/power1.png diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power2.png b/Resources/Textures/Interface/Alerts/mana.rsi/power2.png similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power2.png rename to Resources/Textures/Interface/Alerts/mana.rsi/power2.png diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power3.png b/Resources/Textures/Interface/Alerts/mana.rsi/power3.png similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power3.png rename to Resources/Textures/Interface/Alerts/mana.rsi/power3.png diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power4.png b/Resources/Textures/Interface/Alerts/mana.rsi/power4.png similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power4.png rename to Resources/Textures/Interface/Alerts/mana.rsi/power4.png diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power5.png b/Resources/Textures/Interface/Alerts/mana.rsi/power5.png similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power5.png rename to Resources/Textures/Interface/Alerts/mana.rsi/power5.png diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power6.png b/Resources/Textures/Interface/Alerts/mana.rsi/power6.png similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power6.png rename to Resources/Textures/Interface/Alerts/mana.rsi/power6.png diff --git a/Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power7.png b/Resources/Textures/Interface/Alerts/mana.rsi/power7.png similarity index 100% rename from Resources/Textures/Interface/Alerts/shadowkin_power.rsi/power7.png rename to Resources/Textures/Interface/Alerts/mana.rsi/power7.png From fc3c43e0fd8bdde4e66513d2b8160410ffaaeaf5 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Mon, 30 Dec 2024 02:11:19 +0000 Subject: [PATCH 08/18] Automatic Changelog Update (#1200) --- Resources/Changelog/Changelog.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c4f7cbca036..e5120284a08 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8811,3 +8811,14 @@ Entries: id: 6594 time: '2024-12-30T00:46:05.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1380 +- author: FoxxoTrystan + changes: + - type: Tweak + message: Shadowkins has returned and has been reworked. + - type: Add + message: DarkSwap is now in the Psionic Power Pool. + - type: Tweak + message: Psionics can now see their mana pools. + id: 6595 + time: '2024-12-30T02:10:53.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1200 From 6cd17d7957b34cc45bf1bf0f9d338b5bfd87297d Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Sun, 29 Dec 2024 18:24:40 -0800 Subject: [PATCH 09/18] Revert Bad "SS13" Action Bar (#1333) # Description https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/issues/2 https://github.com/space-wizards/space-station-14/pull/21352 ---

Media

https://github.com/user-attachments/assets/d01f01b9-dae7-4d05-91db-ac6e3de30e9f

--- # Changelog :cl: - tweak: Added back support for the action bar to have "loadouts" or quick layouts of actions (man, how many things are called loadouts?) --- Content.Client/Input/ContentContexts.cs | 4 +- .../Options/UI/Tabs/KeyRebindTab.xaml.cs | 4 +- .../Systems/Actions/ActionUIController.cs | 197 +++++++++++++----- .../Actions/Controls/ActionButtonContainer.cs | 30 +-- .../Systems/Actions/Widgets/ActionsBar.xaml | 3 +- .../Actions/Widgets/ActionsBar.xaml.cs | 23 +- Content.Shared/Input/ContentKeyFunctions.cs | 19 +- Resources/keybinds.yml | 40 ++++ 8 files changed, 238 insertions(+), 82 deletions(-) diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 188d664b395..3556a428fe3 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -97,9 +97,9 @@ public static void SetupContexts(IInputContextContainer contexts) common.AddFunction(ContentKeyFunctions.OpenActionsMenu); foreach (var boundKey in ContentKeyFunctions.GetHotbarBoundKeys()) - { common.AddFunction(boundKey); - } + foreach (var boundKey in ContentKeyFunctions.GetLoadoutBoundKeys()) + common.AddFunction(boundKey); var aghost = contexts.New("aghost", "common"); aghost.AddFunction(EngineKeyFunctions.MoveUp); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 21d9ae45607..a525143e4e1 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -271,9 +271,9 @@ void AddCheckBox(string checkBoxName, bool currentState, Action _actions = new(); + private readonly List _pages = new(); + private int _currentPageIndex = DefaultPageIndex; private readonly DragDropHelper _menuDragHelper; private readonly TextureRect _dragShadow; private ActionsWindow? _window; private ActionsBar? ActionsBar => UIManager.GetActiveUIWidgetOrNull(); private MenuButton? ActionButton => UIManager.GetActiveUIWidgetOrNull()?.ActionButton; + private ActionPage CurrentPage => _pages[_currentPageIndex]; public bool IsDragging => _menuDragHelper.IsDragging; @@ -75,8 +79,13 @@ public ActionUIController() Stretch = StretchMode.Scale, Visible = false, SetSize = new Vector2(64, 64), - MouseFilter = MouseFilterMode.Ignore + MouseFilter = MouseFilterMode.Ignore, }; + + var pageCount = ContentKeyFunctions.GetLoadoutBoundKeys().Length; + var buttonCount = ContentKeyFunctions.GetHotbarBoundKeys().Length; + for (var i = 0; i < pageCount; i++) + _pages.Add(new ActionPage(buttonCount)); } public override void Initialize() @@ -129,6 +138,15 @@ public void OnStateEntered(GameplayState state) }, false, true)); } + var loadoutKeys = ContentKeyFunctions.GetLoadoutBoundKeys(); + for (var i = 0; i < loadoutKeys.Length; i++) + { + var boundId = i; // This is needed, because the lambda captures it. + var boundKey = loadoutKeys[i]; + builder = builder.Bind(boundKey, + InputCmdHandler.FromDelegate(_ => ChangePage(boundId))); + } + builder .Bind(ContentKeyFunctions.OpenActionsMenu, InputCmdHandler.FromDelegate(_ => ToggleWindow())) @@ -315,34 +333,80 @@ public void OnStateExited(GameplayState state) private void TriggerAction(int index) { if (_actionsSystem == null || - !_actions.TryGetValue(index, out var actionId) || + CurrentPage[index] is not { } actionId || !_actionsSystem.TryGetActionData(actionId, out var baseAction)) - { return; - } if (baseAction is BaseTargetActionComponent action) - ToggleTargeting(actionId.Value, action); + ToggleTargeting(actionId, action); else - _actionsSystem?.TriggerAction(actionId.Value, baseAction); + _actionsSystem?.TriggerAction(actionId, baseAction); + } + + private void ChangePage(int index) + { + if (_actionsSystem == null) + return; + + var lastPage = _pages.Count - 1; + if (index < 0) + index = lastPage; + else if (index > lastPage) + index = 0; + + _currentPageIndex = index; + var page = _pages[_currentPageIndex]; + _container?.SetActionData(_actionsSystem, page); + + ActionsBar!.PageButtons.Label.Text = $"{_currentPageIndex + 1}"; + } + + private void OnLeftArrowPressed(ButtonEventArgs args) => ChangePage(_currentPageIndex - 1); + + private void OnRightArrowPressed(ButtonEventArgs args) => ChangePage(_currentPageIndex + 1); + + private void AppendAction(EntityUid action) + { + if (_container == null) + return; + + foreach (var button in _container.GetButtons()) + { + if (button.ActionId != null) + continue; + + SetAction(button, action); + return; + } + + foreach (var page in _pages) + for (var i = 0; i < page.Size; i++) + { + var pageAction = page[i]; + if (pageAction != null) + continue; + + page[i] = action; + return; + } } private void OnActionAdded(EntityUid actionId) { if (_actionsSystem == null || !_actionsSystem.TryGetActionData(actionId, out var action)) - { return; - } // if the action is toggled when we add it, start targeting if (action is BaseTargetActionComponent targetAction && action.Toggled) StartTargeting(actionId, targetAction); - if (_actions.Contains(actionId)) - return; + foreach (var page in _pages) + for (var i = 0; i < page.Size; i++) + if (page[i] == actionId) + return; - _actions.Add(actionId); + AppendAction(actionId); } private void OnActionRemoved(EntityUid actionId) @@ -353,19 +417,24 @@ private void OnActionRemoved(EntityUid actionId) if (actionId == SelectingTargetFor) StopTargeting(); - _actions.RemoveAll(x => x == actionId); + foreach (var page in _pages) + for (var i = 0; i < page.Size; i++) + if (page[i] == actionId) + page[i] = null; } private void OnActionsUpdated() { QueueWindowUpdate(); + if (_container == null) + return; // TODO ACTIONS allow buttons to persist across state applications // Then we don't have to interrupt drags any time the buttons get rebuilt. _menuDragHelper.EndDrag(); if (_actionsSystem != null) - _container?.SetActionData(_actionsSystem, _actions.ToArray()); + _container?.SetActionData(_actionsSystem, _pages[_currentPageIndex]); } private void ActionButtonPressed(ButtonEventArgs args) @@ -512,7 +581,7 @@ private void SearchAndDisplay() PopulateActions(actions); } - private void SetAction(ActionButton button, EntityUid? actionId, bool updateSlots = true) + private void SetAction(ActionButton button, EntityUid? actionId) { if (_actionsSystem == null) return; @@ -523,27 +592,28 @@ private void SetAction(ActionButton button, EntityUid? actionId, bool updateSlot { button.ClearData(); if (_container?.TryGetButtonIndex(button, out position) ?? false) - { - if (_actions.Count > position && position >= 0) - _actions.RemoveAt(position); - } + CurrentPage[position] = null; } else if (button.TryReplaceWith(actionId.Value, _actionsSystem) && _container != null && _container.TryGetButtonIndex(button, out position)) - { - if (position >= _actions.Count) - { - _actions.Add(actionId); - } + if (position >= 0 && position < CurrentPage.Size) + CurrentPage[position] = actionId; else { - _actions[position] = actionId; + if (_pages.Count <= _currentPageIndex) + return; + // Add the button to the next page if there's no space on the current one + var nextPage = _pages[_currentPageIndex + 1]; + int i; + for (i = 0; i < nextPage.Size; i++) + if (nextPage[i] == null) + { + nextPage[i] = actionId; + break; + } + ChangePage(_currentPageIndex + 1); //TODO: Make this a client config? } - } - - if (updateSlots) - _container?.SetActionData(_actionsSystem, _actions.ToArray()); } private void DragAction() @@ -559,14 +629,14 @@ private void DragAction() if (currentlyHovered is ActionButton button) { swapAction = button.ActionId; - SetAction(button, action, false); + SetAction(button, action); } if (dragged.Parent is ActionButtonContainer) - SetAction(dragged, swapAction, false); + SetAction(dragged, swapAction); if (_actionsSystem != null) - _container?.SetActionData(_actionsSystem, _actions.ToArray()); + _container?.SetActionData(_actionsSystem, _pages[_currentPageIndex]); _menuDragHelper.EndDrag(); } @@ -717,9 +787,10 @@ private void UnloadGui() _actionsSystem?.UnlinkAllActions(); if (ActionsBar == null) - { return; - } + + ActionsBar.PageButtons.LeftArrow.OnPressed -= OnLeftArrowPressed; + ActionsBar.PageButtons.RightArrow.OnPressed -= OnRightArrowPressed; if (_window != null) { @@ -747,9 +818,10 @@ private void LoadGui() _window.FilterButton.OnItemSelected += OnFilterSelected; if (ActionsBar == null) - { return; - } + + ActionsBar.PageButtons.LeftArrow.OnPressed += OnLeftArrowPressed; + ActionsBar.PageButtons.RightArrow.OnPressed += OnRightArrowPressed; RegisterActionContainer(ActionsBar.ActionsContainer); @@ -779,13 +851,10 @@ private void AssignSlots(List assignments) if (_actionsSystem == null) return; - _actions.Clear(); - foreach (var assign in assignments) - { - _actions.Add(assign.ActionId); - } + foreach (ref var assignment in CollectionsMarshal.AsSpan(assignments)) + _pages[assignment.Hotbar][assignment.Slot] = assignment.ActionId; - _container?.SetActionData(_actionsSystem, _actions.ToArray()); + _container?.SetActionData(_actionsSystem, _pages[_currentPageIndex]); } public void RemoveActionContainer() @@ -822,7 +891,7 @@ private void OnComponentLinked(ActionsComponent component) return; LoadDefaultActions(); - _container?.SetActionData(_actionsSystem, _actions.ToArray()); + _container?.SetActionData(_actionsSystem, _pages[_currentPageIndex]); QueueWindowUpdate(); } @@ -841,11 +910,27 @@ private void LoadDefaultActions() var actions = _actionsSystem.GetClientActions().Where(action => action.Comp.AutoPopulate).ToList(); actions.Sort(ActionComparer); - _actions.Clear(); - foreach (var (action, _) in actions) + var offset = 0; + var totalPages = _pages.Count; + var pagesLeft = totalPages; + var currentPage = DefaultPageIndex; + while (pagesLeft > 0) { - if (!_actions.Contains(action)) - _actions.Add(action); + var page = _pages[currentPage]; + var pageSize = page.Size; + + for (var slot = 0; slot < pageSize; slot++) + if (slot + offset < actions.Count) + page[slot] = actions[slot + offset].Id; + else + page[slot] = null; + + offset += pageSize; + currentPage++; + if (currentPage == totalPages) + currentPage = 0; + + pagesLeft--; } } @@ -956,4 +1041,22 @@ private void StopTargeting() handOverlay.IconOverride = null; handOverlay.EntityOverride = null; } + + //TODO: Serialize this shit + private sealed class ActionPage(int size) + { + public readonly EntityUid?[] Data = new EntityUid?[size]; + + public EntityUid? this[int index] + { + get => Data[index]; + set => Data[index] = value; + } + + public static implicit operator EntityUid?[](ActionPage p) => p.Data.ToArray(); + + public void Clear() => Array.Fill(Data, null); + + public int Size => Data.Length; + } } diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs index c5f8adbdea3..c028e2a76db 100644 --- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs +++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs @@ -18,25 +18,18 @@ public class ActionButtonContainer : GridContainer public event Action? ActionUnpressed; public event Action? ActionFocusExited; - public ActionButtonContainer() - { - IoCManager.InjectDependencies(this); - } + public ActionButtonContainer() => IoCManager.InjectDependencies(this); - public ActionButton this[int index] - { - get => (ActionButton) GetChild(index); - } + public ActionButton this[int index] => (ActionButton) GetChild(index); private void BuildActionButtons(int count) { var keys = ContentKeyFunctions.GetHotbarBoundKeys(); Children.Clear(); - for (var index = 0; index < count; index++) - { - Children.Add(MakeButton(index)); - } + for (var i = 0; i < count; i++) + AddChild(MakeButton(i)); + return; ActionButton MakeButton(int index) { @@ -47,9 +40,7 @@ ActionButton MakeButton(int index) button.KeyBind = boundKey; if (_input.TryGetKeyBinding(boundKey, out var binding)) - { button.Label.Text = binding.GetKeyString(); - } return button; } @@ -57,7 +48,7 @@ ActionButton MakeButton(int index) public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes) { - var uniqueCount = Math.Min(system.GetClientActions().Count(), actionTypes.Length + 1); + var uniqueCount = Math.Max(ContentKeyFunctions.GetHotbarBoundKeys().Length, actionTypes.Length + 1); if (ChildCount != uniqueCount) BuildActionButtons(uniqueCount); @@ -72,9 +63,7 @@ public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes) public void ClearActionData() { foreach (var button in Children) - { ((ActionButton) button).ClearData(); - } } protected override void ChildAdded(Control newChild) @@ -114,14 +103,9 @@ public bool TryGetButtonIndex(ActionButton button, out int position) public IEnumerable GetButtons() { foreach (var control in Children) - { if (control is ActionButton button) yield return button; - } } - ~ActionButtonContainer() - { - UserInterfaceManager.GetUIController().RemoveActionContainer(); - } + ~ActionButtonContainer() => UserInterfaceManager.GetUIController().RemoveActionContainer(); } diff --git a/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml b/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml index 1d317f6155d..961f720925a 100644 --- a/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml +++ b/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml @@ -14,6 +14,7 @@ MaxSize="64 9999" Name="ActionsContainer" Access="Public" - Rows="1"/> + Rows="1" /> + diff --git a/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml.cs b/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml.cs index 8e95992ff64..b11357cf8eb 100644 --- a/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml.cs +++ b/Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml.cs @@ -1,4 +1,6 @@ -using Robust.Client.AutoGenerated; +using Content.Client.UserInterface.Systems.Actions.Controls; +using Content.Shared.Input; +using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; @@ -7,9 +9,26 @@ namespace Content.Client.UserInterface.Systems.Actions.Widgets; [GenerateTypedNameReferences] public sealed partial class ActionsBar : UIWidget { + [Dependency] private readonly IEntityManager _entity = default!; + + public ActionsBar() { RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); + + var keys = ContentKeyFunctions.GetHotbarBoundKeys(); + for (var index = 1; index < keys.Length; index++) + ActionsContainer.Children.Add(MakeButton(index)); + ActionsContainer.Children.Add(MakeButton(0)); + + ActionButton MakeButton(int index) + { + var boundKey = keys[index]; + var button = new ActionButton(_entity); + button.KeyBind = boundKey; + button.Label.Text = index.ToString(); + return button; + } } } - diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 2727a400a40..7968de01efd 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -98,12 +98,21 @@ public static class ContentKeyFunctions public static readonly BoundKeyFunction Hotbar7 = "Hotbar7"; public static readonly BoundKeyFunction Hotbar8 = "Hotbar8"; public static readonly BoundKeyFunction Hotbar9 = "Hotbar9"; - public static BoundKeyFunction[] GetHotbarBoundKeys() => - new[] - { - Hotbar1, Hotbar2, Hotbar3, Hotbar4, Hotbar5, Hotbar6, Hotbar7, Hotbar8, Hotbar9, Hotbar0 - }; + new[] { Hotbar1, Hotbar2, Hotbar3, Hotbar4, Hotbar5, Hotbar6, Hotbar7, Hotbar8, Hotbar9, Hotbar0, }; + + public static readonly BoundKeyFunction Loadout0 = "Loadout0"; + public static readonly BoundKeyFunction Loadout1 = "Loadout1"; + public static readonly BoundKeyFunction Loadout2 = "Loadout2"; + public static readonly BoundKeyFunction Loadout3 = "Loadout3"; + public static readonly BoundKeyFunction Loadout4 = "Loadout4"; + public static readonly BoundKeyFunction Loadout5 = "Loadout5"; + public static readonly BoundKeyFunction Loadout6 = "Loadout6"; + public static readonly BoundKeyFunction Loadout7 = "Loadout7"; + public static readonly BoundKeyFunction Loadout8 = "Loadout8"; + public static readonly BoundKeyFunction Loadout9 = "Loadout9"; + public static BoundKeyFunction[] GetLoadoutBoundKeys() => + new[] { Loadout1, Loadout2, Loadout3, Loadout4, Loadout5, Loadout6, Loadout7, Loadout8, Loadout9, Loadout0, }; public static readonly BoundKeyFunction Vote0 = "Vote0"; public static readonly BoundKeyFunction Vote1 = "Vote1"; diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 68b84c7fe2e..340280ff798 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -550,6 +550,46 @@ binds: - function: Hotbar9 type: State key: Num9 +- function: Loadout0 + type: State + key: Num0 + mod1: Shift +- function: Loadout1 + type: State + key: Num1 + mod1: Shift +- function: Loadout2 + type: State + key: Num2 + mod1: Shift +- function: Loadout3 + type: State + key: Num3 + mod1: Shift +- function: Loadout4 + type: State + key: Num4 + mod1: Shift +- function: Loadout5 + type: State + key: Num5 + mod1: Shift +- function: Loadout6 + type: State + key: Num6 + mod1: Shift +- function: Loadout7 + type: State + key: Num7 + mod1: Shift +- function: Loadout8 + type: State + key: Num8 + mod1: Shift +- function: Loadout9 + type: State + key: Num9 + mod1: Shift - function: LookUp type: State key: Space From 7ab93396d0279098c747fccddb4ddde6c223aee9 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Mon, 30 Dec 2024 02:25:06 +0000 Subject: [PATCH 10/18] Automatic Changelog Update (#1333) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e5120284a08..91d32d30b7c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8822,3 +8822,12 @@ Entries: id: 6595 time: '2024-12-30T02:10:53.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1200 +- author: DEATHB4DEFEAT + changes: + - type: Tweak + message: >- + Added back support for the action bar to have "loadouts" or quick + layouts of actions (man, how many things are called loadouts?) + id: 6596 + time: '2024-12-30T02:24:41.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1333 From 5b157391ec44ac19bcb0a5018dd7e7b0eed25846 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 30 Dec 2024 15:15:16 -0600 Subject: [PATCH 11/18] Arrivals Tweaks (#1371) # Description Arrivals spawns have been limited to only the massive cryogenics bay, and impassable barriers have been added that block access to the deeper parts of Terminal. I've also modified the admeme items that were in displays so that they are now fake items that can't actually be used by players even if they SOMEHOW smash their way in and defeat the turrets. I have photo evidence of people doing this. Just in case, I also made arrivals a ProtectedGrid. # Changelog :cl: - tweak: Tweaked arrivals to reduce the playable area, and some concessions have been made to prevent access to admeme items that were on display. These changes are pending a later update where we port Arrivals Job Spawns. --- Resources/Maps/Misc/terminal.yml | 221 ++++++++++++++++++++++++------- 1 file changed, 176 insertions(+), 45 deletions(-) diff --git a/Resources/Maps/Misc/terminal.yml b/Resources/Maps/Misc/terminal.yml index c017bb55426..34c85b11dc2 100644 --- a/Resources/Maps/Misc/terminal.yml +++ b/Resources/Maps/Misc/terminal.yml @@ -35,6 +35,7 @@ entities: components: - type: MetaData name: map 30 + - type: ProtectedGrid - type: Transform - type: Map mapPaused: True @@ -48,6 +49,7 @@ entities: components: - type: MetaData name: CentCom Downstairs + - type: ProtectedGrid - type: Transform parent: 1 - type: MapGrid @@ -4823,6 +4825,9 @@ entities: - type: Transform pos: -3.478174,15.587257 parent: 2 + missingComponents: + - Item + - Pullable - proto: BodyBagFolded entities: - uid: 2019 @@ -16556,6 +16561,9 @@ entities: - type: Transform pos: 2.5162191,14.7318 parent: 2 + missingComponents: + - Item + - Pullable - proto: CarbonDioxideCanister entities: - uid: 8607 @@ -19089,6 +19097,25 @@ entities: - type: Transform pos: 4.5232472,13.728849 parent: 2 + - type: GroupExamine + group: + - hoverMessage: "" + contextText: verb-examine-group-other + icon: /Textures/Interface/examine-star.png + components: + - Armor + - ClothingSpeedModifier + entries: + - message: >- + It provides the following protection: + + - [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color]. + priority: 0 + component: Armor + title: null + missingComponents: + - Item + - Pullable - proto: ClothingBackpackSatchelBrigmedic entities: - uid: 1908 @@ -19402,6 +19429,9 @@ entities: - type: Transform pos: 4.4697094,15.602008 parent: 2 + missingComponents: + - Item + - Pullable - proto: ClothingHeadsetMining entities: - uid: 1076 @@ -19461,6 +19491,9 @@ entities: - type: Transform pos: -5.5118904,15.498761 parent: 2 + missingComponents: + - Item + - Pullable - proto: ClothingMaskGasExplorer entities: - uid: 8612 @@ -19506,6 +19539,9 @@ entities: - type: Transform pos: 4.4697094,14.717052 parent: 2 + missingComponents: + - Item + - Pullable - proto: ClothingNeckHeadphones entities: - uid: 8036 @@ -20566,6 +20602,58 @@ entities: - type: Transform pos: 0.5,35.5 parent: 2 +- proto: DecorFloorPalletStack + entities: + - uid: 8093 + components: + - type: Transform + pos: -17.5,-39.5 + parent: 2 + - uid: 8094 + components: + - type: Transform + pos: -17.5,-38.5 + parent: 2 + - uid: 8095 + components: + - type: Transform + pos: -17.5,-40.5 + parent: 2 + - uid: 8134 + components: + - type: Transform + pos: 16.5,-38.5 + parent: 2 + - uid: 8135 + components: + - type: Transform + pos: 16.5,-39.5 + parent: 2 + - uid: 8153 + components: + - type: Transform + pos: 16.5,-40.5 + parent: 2 + - uid: 8674 + components: + - type: Transform + pos: -1.5,-12.5 + parent: 2 + - uid: 8675 + components: + - type: Transform + pos: -0.5,-12.5 + parent: 2 + - uid: 8676 + components: + - type: Transform + pos: 0.5,-12.5 + parent: 2 + - uid: 8680 + components: + - type: Transform + pos: -1.5,-13.5 + parent: 2 - proto: DisposalBend entities: - uid: 5696 @@ -24375,6 +24463,9 @@ entities: - type: Transform pos: 2.5111954,18.597483 parent: 2 + missingComponents: + - Item + - Pullable - proto: FoodDonkpocketSpicy entities: - uid: 7843 @@ -24390,6 +24481,9 @@ entities: - type: Transform pos: -5.5118904,13.610855 parent: 2 + missingComponents: + - Item + - Pullable - proto: FoodPizzaMeatSlice entities: - uid: 8650 @@ -38500,6 +38594,58 @@ entities: - type: Transform pos: 38.5,-3.5 parent: 2 +- proto: MarkerBlocker + entities: + - uid: 8131 + components: + - type: Transform + pos: 16.5,-38.5 + parent: 2 + - uid: 8132 + components: + - type: Transform + pos: 16.5,-39.5 + parent: 2 + - uid: 8133 + components: + - type: Transform + pos: 16.5,-40.5 + parent: 2 + - uid: 8677 + components: + - type: Transform + pos: 0.5,-12.5 + parent: 2 + - uid: 8678 + components: + - type: Transform + pos: -0.5,-12.5 + parent: 2 + - uid: 8679 + components: + - type: Transform + pos: -1.5,-12.5 + parent: 2 + - uid: 8681 + components: + - type: Transform + pos: -1.5,-13.5 + parent: 2 + - uid: 8682 + components: + - type: Transform + pos: -17.5,-38.5 + parent: 2 + - uid: 8683 + components: + - type: Transform + pos: -17.5,-39.5 + parent: 2 + - uid: 8684 + components: + - type: Transform + pos: -17.5,-40.5 + parent: 2 - proto: Matchbox entities: - uid: 7912 @@ -42818,51 +42964,6 @@ entities: - type: Transform pos: -8.5,-10.5 parent: 2 - - uid: 8093 - components: - - type: Transform - pos: 24.5,-3.5 - parent: 2 - - uid: 8094 - components: - - type: Transform - pos: 22.5,2.5 - parent: 2 - - uid: 8095 - components: - - type: Transform - pos: 42.5,-10.5 - parent: 2 - - uid: 8131 - components: - - type: Transform - pos: 6.5,2.5 - parent: 2 - - uid: 8132 - components: - - type: Transform - pos: 5.5,-6.5 - parent: 2 - - uid: 8133 - components: - - type: Transform - pos: 3.5,-6.5 - parent: 2 - - uid: 8134 - components: - - type: Transform - pos: -7.5,4.5 - parent: 2 - - uid: 8135 - components: - - type: Transform - pos: -5.5,5.5 - parent: 2 - - uid: 8153 - components: - - type: Transform - pos: -6.5,-6.5 - parent: 2 - uid: 8745 components: - type: Transform @@ -44306,6 +44407,9 @@ entities: - type: Transform pos: 2.5752501,15.498761 parent: 2 + missingComponents: + - Item + - Pullable - proto: TelecomServerFilled entities: - uid: 3110 @@ -44320,6 +44424,9 @@ entities: - type: Transform pos: -3.5098875,18.597483 parent: 2 + missingComponents: + - Item + - Pullable - proto: ToolboxEmergencyFilled entities: - uid: 8570 @@ -52935,6 +53042,9 @@ entities: - type: Transform pos: -3.537204,14.761298 parent: 2 + missingComponents: + - Item + - Pullable - proto: WeaponTaser entities: - uid: 3057 @@ -52942,6 +53052,9 @@ entities: - type: Transform pos: 2.5111954,11.4883375 parent: 2 + missingComponents: + - Item + - Pullable - proto: WeaponTetherGun entities: - uid: 3059 @@ -52949,6 +53062,9 @@ entities: - type: Transform pos: -5.5782247,14.510563 parent: 2 + missingComponents: + - Item + - Pullable - proto: WeaponTurretHostile entities: - uid: 1237 @@ -52980,6 +53096,9 @@ entities: - type: Transform pos: -3.513493,11.505985 parent: 2 + missingComponents: + - Item + - Pullable - proto: WelderMini entities: - uid: 1178 @@ -53087,11 +53206,15 @@ entities: - type: Transform pos: 2.5,-14.5 parent: 2 + - type: Godmode + oldDamage: {} - uid: 189 components: - type: Transform pos: 1.5,-14.5 parent: 2 + - type: Godmode + oldDamage: {} - uid: 190 components: - type: Transform @@ -53132,11 +53255,15 @@ entities: - type: Transform pos: -3.5,-14.5 parent: 2 + - type: Godmode + oldDamage: {} - uid: 321 components: - type: Transform pos: -2.5,-14.5 parent: 2 + - type: Godmode + oldDamage: {} - uid: 335 components: - type: Transform @@ -53192,11 +53319,15 @@ entities: - type: Transform pos: 1.5,-12.5 parent: 2 + - type: Godmode + oldDamage: {} - uid: 797 components: - type: Transform pos: -2.5,-12.5 parent: 2 + - type: Godmode + oldDamage: {} - uid: 936 components: - type: Transform From e4a2c0c6c70ed8617eb9162e0ffdbcde9169f4ad Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Mon, 30 Dec 2024 21:15:41 +0000 Subject: [PATCH 12/18] Automatic Changelog Update (#1371) --- Resources/Changelog/Changelog.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 91d32d30b7c..ebbd44f3cef 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8831,3 +8831,13 @@ Entries: id: 6596 time: '2024-12-30T02:24:41.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1333 +- author: VMSolidus + changes: + - type: Tweak + message: >- + Tweaked arrivals to reduce the playable area, and some concessions have + been made to prevent access to admeme items that were on display. These + changes are pending a later update where we port Arrivals Job Spawns. + id: 6597 + time: '2024-12-30T21:15:16.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1371 From eb1dde1257446f273e314646aa3f8cdd41e9c192 Mon Sep 17 00:00:00 2001 From: Blu <79374236+BlueHNT@users.noreply.github.com> Date: Mon, 30 Dec 2024 22:23:21 +0100 Subject: [PATCH 13/18] Adjusts Cargo Market (#1377) # Description Long story short, cargo and command abuses the new reverse-engineered suits and warning them as admins about it is getting quite tiring. So I decided to put my hand to the craft and comment them out for now, until a better way for them to be gotten is made. I have also taken this opportunity to fix some of the longstanding issues with cargo I have had, such as there missing sec masks in the riot crate or there not being a way to get the swat items. While I am still missing the properly developed versions with space proofing and minor cold/head protection, the old non ARCS riot suit will do for now. This PR fixes https://github.com/Simple-Station/Einstein-Engines/issues/1376 --- # TODO - [x] Remove problematic items from cargo - [x] Add proper swat crate Opt: - [x] Make proper swat set (soon:tm:) - [x] Adjust the armor values to fit better (can be delayed) ---

Media

I ain't got nothing chief.

--- # Changelog :cl: - add: Added swat suit - add: Added swat crate - add: Added new crate category for secure reinforced crates - tweak: Tweaked security supplies and crates - tweak: Tweaked the price of Cybersun's tacsuits because apparently they weren't charging enough to properly scam salvage techs. - tweak: Tweaked `StructuralMetallicStrong` structural protection from 10 to 80 --------- Signed-off-by: VMSolidus Co-authored-by: VMSolidus --- .../Catalog/Cargo/cargo_hardsuits.yml | 5 +-- .../Catalog/Cargo/cargo_security.yml | 12 ++++++- .../Catalog/Fills/Crates/security.yml | 32 ++++++++++++++---- Resources/Prototypes/Damage/modifier_sets.yml | 2 +- .../DeltaV/Catalog/Cargo/cargo_armory.yml | 4 +-- .../DeltaV/Catalog/Fills/Crates/armory.yml | 2 +- .../Entities/Clothing/Head/helmets.yml | 19 ++++++----- .../Entities/Clothing/OuterClothing/armor.yml | 29 ++++++++++++++++ .../Entities/Clothing/Shoes/specific.yml | 4 ++- .../Storage/Crates/base_structurecrates.yml | 20 +++++++++++ .../Structures/Storage/Crates/crates.yml | 6 ++-- .../Armor/swat.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1728 bytes .../OuterClothing/Armor/swat.rsi/icon.png | Bin 0 -> 762 bytes .../Armor/swat.rsi/inhand-left.png | Bin 0 -> 701 bytes .../Armor/swat.rsi/inhand-right.png | Bin 0 -> 702 bytes .../OuterClothing/Armor/swat.rsi/meta.json | 26 ++++++++++++++ 16 files changed, 136 insertions(+), 25 deletions(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml index a2f8b035b0f..ebd73438ab9 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml @@ -41,13 +41,14 @@ group: market # Security +# Can't abuse em if you only got 1, good luck spamming frezon - type: cargoProduct id: SecurityShanlinTacsuit icon: sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi state: icon product: CrateSecurityShanlinTacsuit - cost: 17500 + cost: 75000 category: cargoproduct-category-name-hardsuits group: market @@ -57,7 +58,7 @@ sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi state: icon product: CrateSecurityGuanYuTacsuit - cost: 30000 + cost: 125000 category: cargoproduct-category-name-hardsuits group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index e22f9fd5e71..48f3c87bfd1 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -38,13 +38,23 @@ category: cargoproduct-category-name-security group: market +- type: cargoProduct + id: SecuritySwat + icon: + sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite + state: icon + product: CrateSecuritySwat + cost: 12500 + category: cargoproduct-category-name-security + group: market + - type: cargoProduct id: SecuritySupplies icon: sprite: Objects/Storage/boxes.rsi state: box_security product: CrateSecuritySupplies - cost: 500 + cost: 1000 category: cargoproduct-category-name-security group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index 592c1535083..02400ab39dc 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -41,8 +41,8 @@ - type: entity id: CrateSecurityRiot parent: CrateSecgear - name: swat crate - description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open. + name: riot crate + description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Security access to open. components: - type: StorageFill contents: @@ -56,7 +56,27 @@ amount: 2 - id: RiotShield amount: 2 -# - SecGasmask + - id: ClothingMaskGasSecurity + amount: 2 + +- type: entity + id: CrateSecuritySwat + parent: CrateSecgear + name: swat crate + description: Contains two sets of all encompassing swat suits. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorSwat + amount: 2 + - id: ClothingHeadHelmetSwat + amount: 2 + - id: ClothingMaskGasSwat + amount: 2 + - id: ClothingHandsGlovesCombat + amount: 2 + - id: ClothingShoesSwat + amount: 2 - type: entity id: CrateSecuritySupplies @@ -68,9 +88,9 @@ contents: - id: BoxHandcuff - id: BoxSechud -# - SecBelt -# - SecGasmask -# - SpacelawBook + - id: ClothingBeltSecurityFilled + - id: ClothingMaskGasSecurity + - id: BookSecurity # replace with lawbook at some point - type: entity id: CrateRestraints diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 8366453e587..f8401de063a 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -22,7 +22,7 @@ Slash: 10 Piercing: 10 Heat: 10 - Structural: 10 + Structural: 80 - type: damageModifierSet id: StructuralMetallic diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml index 1dae88730c1..f1800b445a9 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml @@ -14,7 +14,7 @@ sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi state: icon product: CrateArmoryUniversal - cost: 6500 + cost: 22500 category: Armory group: market @@ -37,7 +37,7 @@ cost: 5500 category: Armory group: market - + - type: cargoProduct id: ArmoryEnergyGunMini icon: diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml index a321cdf059c..a4dc8b6a882 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml @@ -30,7 +30,7 @@ amount: 2 - id: BoxLethalshot amount: 3 - + - type: entity id: CrateArmoryEnergyGun parent: CrateWeaponSecure diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 009c2ef784e..795984bb452 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -37,7 +37,7 @@ #SWAT Helmet - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, ClothingHeadEVAHelmetBase] id: ClothingHeadHelmetSwat name: SWAT helmet description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. @@ -46,15 +46,18 @@ sprite: Clothing/Head/Helmets/swat.rsi - type: Clothing sprite: Clothing/Head/Helmets/swat.rsi - - type: Armor #This is intentionally not spaceproof, when the time comes to port the values from SS13 this should be buffed from what it was. + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 1000 + - type: Armor modifiers: coefficients: - Blunt: 0.80 - Slash: 0.80 - Piercing: 0.80 - Heat: 0.80 - Radiation: 0.80 - Caustic: 0.95 + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.85 + Radiation: 0.8 + Caustic: 0.9 - type: ExplosionResistance damageCoefficient: 0.75 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 46a431ddff2..2679073b067 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -56,6 +56,35 @@ damageCoefficient: 0.9 - type: GroupExamine +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, ClothingOuterEVASuitBase] + id: ClothingOuterArmorSwat + name: swat suit + description: Composed of semi-flexible polycarbonate, reinforced materials, and integrated ballistic plating, it offers exceptional protection against melee, bullet, and environmental threats, ensuring officers remain combat-ready in the harshest conditions. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/swat.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Armor/swat.rsi + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.85 + Radiation: 0.75 + Caustic: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.50 + - type: ClothingSpeedModifier # Burdensome for running, but perfect for speedy gliding, even though running is still probably better + walkModifier: 0.9 + sprintModifier: 0.7 + - type: GroupExamine + - type: entity parent: ClothingOuterArmorBasic id: ClothingOuterArmorBulletproof diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 4ae752345a7..3ec17e2bbe4 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -127,7 +127,7 @@ sprintModifier: 1.3 - type: entity - parent: ClothingShoesBaseButcherable + parent: ClothingShoesMilitaryBase id: ClothingShoesSwat name: swat shoes description: When you want to turn up the heat. @@ -136,6 +136,8 @@ sprite: Clothing/Shoes/Specific/swat.rsi - type: Clothing sprite: Clothing/Shoes/Specific/swat.rsi + - type: ClothingSlowOnDamageModifier + modifier: 0.5 - type: entity parent: ClothingShoesBaseButcherable diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index 52deca8e096..14c2325c81a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -149,3 +149,23 @@ - Energy reflectProb: 0.2 spread: 90 + +- type: entity + parent: CrateBaseSecure + id: CrateBaseSecureReinforced + suffix: Secure, Reinforced + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index bd8281f1949..57c105bb82f 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -297,7 +297,7 @@ access: [["Hydroponics"]] - type: entity - parent: CrateBaseSecure + parent: CrateBaseSecureReinforced id: CrateWeaponSecure name: secure weapon crate components: @@ -309,8 +309,8 @@ access: [["Armory"]] - type: entity - parent: CrateBaseSecure - suffix: Armory, Secure + parent: CrateBaseSecureReinforced + suffix: Armory, Secure, Reinforced id: CrateContrabandStorageSecure name: contraband storage crate description: An armory access locked crate for storing contraband confiscated from suspects or prisoners. diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..08595405711cfbf687ca0ab3b05d22231def29b5 GIT binary patch literal 1728 zcmV;x20!_UP)Px*dPzh)*(fz@Z!~!j8?t?G+mMU0T7w9W@M`P z2CNzU1tO0xEh`IAC8SU%@>JVtC1)Y`4(VMDf#5SZeP6x)Nf!2TzW?L9=k6Y#56H>M z$;rvd$@!mBNRp}B?b6|Jh$xB>h9PFN*^~PSAyk%SNRos`qk&JKJ|!yqPwQ{YLpH*w{Q2`^p@jn2 zecN<{b^4c=mpD8;#B@64zsJYNsq{B?f$r%k9_DjYDiz${-(xbF002zWL=XfpO%uRl zW!&H2qf)8hVLnIq^fc{rC(>6G1&4=+P!we={k65j1|L;b7hFDyBA%z+ZeuVQ@N3o& zS$@y+0HhlXpVN0;7stoP+ygEzFQI8#D*b0YpkA*7c2*ZkJDgA3l8G=iP3Xmdj096!a;Ww_oshl`#y8!Dq^?H3_%DcV2;;ORaLqBrJV)V-N$s62f?_0 zl5!XuyTF$(Ult09KlE}MV>B8SJkLwj@|$2<)9IAQ0IO_BO5)ZbgwT4uj^W>bW3O0* zs;Ybp@H`I>^EnzvM^7qjS7fE1C=`yo6_k|bd?8bQ}}L{S7?*YW1f8|iP*oM3PG@8MElQU9iE3(HfwS4H@Z5h%jrh0g=j7z%U-L?E9EXc%{TfOLp{x;@CobER$+9>bSS-uJUa`p2ZQDi|hG?}~ zLJzVHtyT+R7{az~p0@X^YsPI&g3yv!v)RO8Fu=Ga2$ub9{`j}CDCU|4byTQ2VodOmSwbB zEoho1TvqBuQC7n&z1eK;baUi$bh};3+<)1QW&1Xfcnp}$W(BtYPL^dJkT4I3_s6VZ zT1>mw>+xWy)9DCxL*ZF~oih>BG-;#Jz;HO^`*^ZumF6njl8|Z|9FNC^_%-mji7|@+ zXcda0P}bk$)1F}%RCF2?HkgH<0QlU?&XWco+oByD(6}x;2f!OADZ*cenZRr|!~2sH zSe6Azl3wiL0l>YvDM*q8%d+tPjHR;3e(t-s?|)>sJ7Hu_=(jR*2#YFlpkDR2~4}$wG*tDD)-cfMq-4yIDm@ zH3-H<*$YysRNDEzfK?DeXsJ}f+1VL1P2&%~+#pFw)ne?Gbk!T+OS}#*r!ia7X#WGy WR$WS2G1Z9x0000Px%v`IukR9J=Wl|63aKp2J}hi%;8l;aep#7$ZpD18tl4q%x(aDpfYh(yaBTrP=E zFqA>an$k{V8sjb4ndN7}X0@wr@=BI9f8Y1c`~3`j;R|2*!heRXx;^>VqSEK7=_ zV7*?So%1}eb{q%WwiynGJU>6Tvfa4J^Sl}$iXs5!^Z6MG?R-2Q1Mu?l0`Oa+r?_jw zGKwM=iv<9-ZR0o&kB^VF{`AcO7K?=;+XjsU>bhn&n<1rSv)NFVB}%EIJxVFcvShQ_ zAf;qBn^D(wD*{&~@;tBJRTX!gjxqT3^kmkhl=!}H#&2(Ld!v?xKGzh6Mg`*OlwDQf zx-Q%87AYkFgTa72&lwB`hRk-m#dTeFRYg3VHksa&y|kc{PY8ih3LyjlWm%d%-BJ57uerE zNfNRw!}op4vc&g&vMeJ>5~Ggmy7YRzM&|(Et}VX5zaNc1K0cUCCL~D$fbaVzC&Dn~ z_4O6lhv2kQF5#jAI&MJ_nD_(c_JDD&RnQPZ82Ov3;HmmCmPG}5R=J-EX$BmV%s)pnjUq;hlht-%mFtfA?y=T zHzg@0pP!#rx7)3C?3GeCCE!g2^y{dR=eZ$pe}8|p_peuh=XrG$MF=6#rKp|izvDOv sA&8>rjO;bEVtUEodcC%;t+lcJ11-5`l>kGE?EnA(07*qoM6N<$f-dP{!vFvP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/swat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5dca6aa06549d83f16e956b9320373f2e42246bb GIT binary patch literal 701 zcmV;u0z&Px%cS%G+RCt{2+Oe*pKokbxpUpNDVy08Bfy#tt+EH5@YYSW7!0;e;`UbWZyn(&6 zHnu{cozceX?%Col#N2G6a1X3^bG`~mI5QlF1DP2>2qA>GnnUj)M~W=0Jqx>05F|S0RYS85=oLgY%fb5 z5g|=e*8cs?PtIV!-rsRN9?|dj^K*;E0+v<$KHBXz(lpI~8)GPrWA=owCcu4r0|4yz z`}|zH-Nxy3dOAk0*Tdm($VX7-^KUM!8J$cfl-+y~1OPsgVcRx*-^Y5re!4x!ap-!z zR{jW7Mr%!4YjPZiCX-3wVs?K`nd_g${uapWc00?qZHz`EY`5FO*JmS1Yfbz8zOp2+ z)&St6if7e6j$`X~yU{b%|Fa+nVB2k;-Z!R)x|jte1#5JCtcgb+dq@j{eRwJdFOV4oG%T2r^%&G~#@D(RK13>8@n zEkh|q^ZA^#*7;t9)oN8L7JCAQ!(rt!z~}SXTCdj_4u=?z#{iJ8Arw`~x~!8&1V0&H-FUm2Dl#uWsBgq#<7X&TR#FESQAk9FtlyE);)y} zDW#~+8W4sd8DqYb0JagJl%htXfkvaj74o6YW`n_CP+NO1M=3>~=aDg{^axPx%cu7P-RCt{2+Odw}Fc1ddKc{O_0HOoLIu#O)TLUc(HAPz90P!Fxc>`Js-hdit z)1<|^mC_+-((PQaGJ?f{yIjJN)qGWAY-gCnN#qz{j4{R-V~jEO{YWWkHk(n}?>}sX zv)PQKl;=i52vSO=cJivElr))4&~CR=>o{Kvgb*~HP5}Um#R34}x-I}9j$>%8Z`!=F zx3@QPoX?PLvH!F+n$PDTBJ}(HbJ=FI0eyTF6=!agQncIc&VRJoY$A^1)cV#0n1)dl zUF`$FulM&{0xe3CBscqwMgyMbL2G?e|K^hLeV_LGJ(46rx7!7Pb0WIkE|$w>sfIwc zTBXzJ^mj4)zE9O^m86tcH^Z{cXWaLFilPYS#9al@NxZ6NaIqlp-^X(^wM#e2(`hilCGtDJAuKz1#yWLaWs} zpZz3B&}y~r)=y1zsq5I z8MoQDwXqgv>4-7L7-Nhv#u#IaF_x=(y;bS6yxz208p#d@{Fe(f*`nBKlH5Q7JZ+|q>SqaE@c`5-$~{KnDuvN1=+J) z4!{3ON=ZtoyNeL>R Date: Mon, 30 Dec 2024 21:23:46 +0000 Subject: [PATCH 14/18] Automatic Changelog Update (#1377) --- Resources/Changelog/Changelog.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ebbd44f3cef..9bcd02da788 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8841,3 +8841,22 @@ Entries: id: 6597 time: '2024-12-30T21:15:16.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1371 +- author: BlueHNT + changes: + - type: Add + message: Added swat suit + - type: Add + message: Added swat crate + - type: Add + message: Added new crate category for secure reinforced crates + - type: Tweak + message: Tweaked security supplies and crates + - type: Tweak + message: >- + Tweaked the price of Cybersun's tacsuits because apparently they weren't + charging enough to properly scam salvage techs. + - type: Tweak + message: Tweaked `StructuralMetallicStrong` structural protection from 10 to 80 + id: 6598 + time: '2024-12-30T21:23:22.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1377 From 8d9f1691f07d2c1e7bc78768e1d5db3838b0494c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 30 Dec 2024 15:28:27 -0600 Subject: [PATCH 15/18] NERF WISPS (#1384) # Description THESE GUYS CAN AND DID SOLO ENTIRE STATIONS, WHAT THE HELL? # Changelog :cl: - tweak: NERFED WISPS, A LOT. --- .../Entities/Mobs/NPCs/glimmer_creatures.yml | 14 ++++++++------ .../Nyanotrasen/Damage/modifier_sets.yml | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml index c2219d7fae3..52f3844c25f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml @@ -96,7 +96,7 @@ - type: MobThresholds thresholds: 0: Alive - 300: Dead + 50: Dead - type: Destructible thresholds: - trigger: @@ -114,7 +114,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Damageable - damageContainer: Spirit + damageContainer: CorporealSpirit damageModifierSet: CorporealSpirit - type: DamageOnDispel damage: @@ -122,9 +122,9 @@ Heat: 100 - type: SlowOnDamage speedModifierThresholds: - 150: 0.8 - 200: 0.6 - 250: 0.3 + 10: 0.8 + 20: 0.6 + 30: 0.3 - type: StatusEffects allowed: - Stun @@ -133,13 +133,15 @@ - Pacified # combat - type: Gun - fireRate: 0.7 + fireRate: 0.4 soundGunshot: collection: MagicMissile showExamineText: false selectedMode: SemiAuto availableModes: - SemiAuto + minAngle: 0.17453 + maxAngle: 0.52359 - type: HitscanBatteryAmmoProvider proto: WispLash fireCost: 1 diff --git a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml index ce313f73b93..860e9ee46db 100644 --- a/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml @@ -42,12 +42,12 @@ id: CorporealSpirit coefficients: Cold: 0.0 - Shock: 0.5 + Shock: 1.5 Blunt: 0.5 Slash: 0.5 Piercing: 0.5 Heat: 1.5 - Holy: 3.0 + Holy: 5.0 - type: damageModifierSet id: ShockAbsorber From ef865f4a9b1ca88302b390ab74e83dd803ff55a5 Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Mon, 30 Dec 2024 21:28:53 +0000 Subject: [PATCH 16/18] Automatic Changelog Update (#1384) --- Resources/Changelog/Changelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9bcd02da788..447ec1bdf07 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8860,3 +8860,10 @@ Entries: id: 6598 time: '2024-12-30T21:23:22.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1377 +- author: VMSolidus + changes: + - type: Tweak + message: NERFED WISPS, A LOT. + id: 6599 + time: '2024-12-30T21:28:28.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1384 From 5fd278f5b8af276900e77139b0c268bc7a14a9e8 Mon Sep 17 00:00:00 2001 From: stellar-novas Date: Mon, 30 Dec 2024 18:01:48 -0500 Subject: [PATCH 17/18] Fix Mindbreaker and Soulbreaker Rounds Not Injecting Their Solutions. (#1378) # Description Fixes #1374 I'm not sure exactly when this changed, but you now have to specify which solution you want to inject. Also inject on hit defaults to ignoring clothing, so I removed the redundant set. --- # Changelog :cl: - fix: Fixed mindbreaker and soulbreaker cartridges not injecting their solutions. Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> --- .../Objects/Weapons/Guns/Ammunition/Projectiles/special.yml | 2 +- .../Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml index 9233a901f9d..4405c7b5146 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml @@ -89,6 +89,6 @@ solution: ammo - type: SolutionInjectOnProjectileHit transferAmount: 9 - blockSlots: NONE #shouldn't be blocked by a mask + solution: ammo - type: InjectableSolution solution: ammo diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml index 47d65ce8f7c..a93249ea21e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Projectiles/shotgun.yml @@ -21,6 +21,6 @@ solution: ammo - type: SolutionInjectOnProjectileHit transferAmount: 15 - blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask + solution: ammo - type: InjectableSolution solution: ammo From 4d464eee84847be6f055ead4984ff5d4c5f137cf Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Mon, 30 Dec 2024 23:02:17 +0000 Subject: [PATCH 18/18] Automatic Changelog Update (#1378) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 447ec1bdf07..a62c5b669ae 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8867,3 +8867,12 @@ Entries: id: 6599 time: '2024-12-30T21:28:28.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1384 +- author: stellar-novas + changes: + - type: Fix + message: >- + Fixed mindbreaker and soulbreaker cartridges not injecting their + solutions. + id: 6600 + time: '2024-12-30T23:01:48.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1378