diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index 26a22fa8b8df..7b13233bab5c 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -51,6 +51,29 @@ public override void Initialize() SubscribeLocalEvent(OnEntityWorldTargetHandleState); } + public override void FrameUpdate(float frameTime) + { + base.FrameUpdate(frameTime); + + var worldActionQuery = EntityQueryEnumerator(); + while (worldActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + + var instantActionQuery = EntityQueryEnumerator(); + while (instantActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + + var entityActionQuery = EntityQueryEnumerator(); + while (entityActionQuery.MoveNext(out var uid, out var action)) + { + UpdateAction(uid, action); + } + } + private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args) { if (args.Current is not InstantActionComponentState state) @@ -95,6 +118,8 @@ private void BaseHandleState(EntityUid uid, BaseActionComponent component, Ba component.Icon = state.Icon; component.IconOn = state.IconOn; component.IconColor = state.IconColor; + component.OriginalIconColor = state.OriginalIconColor; + component.DisabledIconColor = state.DisabledIconColor; component.Keywords.Clear(); component.Keywords.UnionWith(state.Keywords); component.Enabled = state.Enabled; @@ -125,6 +150,8 @@ public override void UpdateAction(EntityUid? actionId, BaseActionComponent? acti if (!ResolveActionData(actionId, ref action)) return; + action.IconColor = action.Charges < 1 ? action.DisabledIconColor : action.OriginalIconColor; + base.UpdateAction(actionId, action); if (_playerManager.LocalEntity != action.AttachedEntity) return; diff --git a/Content.Client/GPS/Components/HandheldGPSComponent.cs b/Content.Client/GPS/Components/HandheldGPSComponent.cs deleted file mode 100644 index 0f5271fd80c4..000000000000 --- a/Content.Client/GPS/Components/HandheldGPSComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Content.Shared.GPS; - -namespace Content.Client.GPS.Components -{ - [RegisterComponent] - public sealed partial class HandheldGPSComponent : SharedHandheldGPSComponent - { - } -} diff --git a/Content.Client/GPS/Systems/HandheldGpsSystem.cs b/Content.Client/GPS/Systems/HandheldGpsSystem.cs index cc2b888da37f..3f38a3b69529 100644 --- a/Content.Client/GPS/Systems/HandheldGpsSystem.cs +++ b/Content.Client/GPS/Systems/HandheldGpsSystem.cs @@ -1,4 +1,4 @@ -using Content.Client.GPS.Components; +using Content.Shared.GPS.Components; using Content.Client.GPS.UI; using Content.Client.Items; diff --git a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs index 7dcf3f29c519..57645e386e73 100644 --- a/Content.Client/GPS/UI/HandheldGpsStatusControl.cs +++ b/Content.Client/GPS/UI/HandheldGpsStatusControl.cs @@ -1,4 +1,4 @@ -using Content.Client.GPS.Components; +using Content.Shared.GPS.Components; using Content.Client.Message; using Content.Client.Stylesheets; using Robust.Client.GameObjects; @@ -30,6 +30,13 @@ protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); + // don't display the label if the gps component is being removed + if (_parent.Comp.LifeStage > ComponentLifeStage.Running) + { + _label.Visible = false; + return; + } + _updateDif += args.DeltaSeconds; if (_updateDif < _parent.Comp.UpdateRate) return; @@ -44,9 +51,9 @@ private void UpdateGpsDetails() var posText = "Error"; if (_entMan.TryGetComponent(_parent, out TransformComponent? transComp)) { - var pos = _transform.GetMapCoordinates(_parent.Owner, xform: transComp); - var x = (int) pos.X; - var y = (int) pos.Y; + var pos = _transform.GetMapCoordinates(_parent.Owner, xform: transComp); + var x = (int)pos.X; + var y = (int)pos.Y; posText = $"({x}, {y})"; } _label.SetMarkup(Loc.GetString("handheld-gps-coordinates-title", ("coordinates", posText))); diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index 63645bc01e91..ec417f749b9b 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -2,6 +2,7 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Utility; +using Content.Shared.Paper; using static Content.Shared.Paper.PaperComponent; namespace Content.Client.Paper.UI; @@ -23,6 +24,10 @@ protected override void Open() _window = this.CreateWindow(); _window.OnSaved += InputOnTextEntered; + if (EntMan.TryGetComponent(Owner, out var paper)) + { + _window.MaxInputLength = paper.ContentSize; + } if (EntMan.TryGetComponent(Owner, out var visuals)) { _window.InitVisuals(Owner, visuals); diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml index 2344afd5ef70..503ae928a3ed 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml +++ b/Content.Client/Paper/UI/PaperWindow.xaml @@ -15,10 +15,13 @@ - - - + + + + + diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index 81b831068c39..02c4ed64c359 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -48,6 +48,20 @@ public sealed partial class PaperWindow : BaseWindow public event Action? OnSaved; + private int _MaxInputLength = -1; + public int MaxInputLength + { + get + { + return _MaxInputLength; + } + set + { + _MaxInputLength = value; + UpdateFillState(); + } + } + public PaperWindow() { IoCManager.InjectDependencies(this); @@ -63,11 +77,21 @@ public PaperWindow() { if (args.Function == EngineKeyFunctions.MultilineTextSubmit) { - RunOnSaved(); - args.Handle(); + // SaveButton is disabled when we hit the max input limit. Just check + // that flag instead of trying to calculate the input length again + if (!SaveButton.Disabled) + { + RunOnSaved(); + args.Handle(); + } } }; + Input.OnTextChanged += args => + { + UpdateFillState(); + }; + SaveButton.OnPressed += _ => { RunOnSaved(); @@ -126,6 +150,7 @@ public void InitVisuals(EntityUid entity, PaperVisualsComponent visuals) PaperContent.ModulateSelfOverride = visuals.ContentImageModulate; WrittenTextLabel.ModulateSelfOverride = visuals.FontAccentColor; + FillStatus.ModulateSelfOverride = visuals.FontAccentColor; var contentImage = visuals.ContentImagePath != null ? _resCache.GetResource(visuals.ContentImagePath) : null; if (contentImage != null) @@ -296,5 +321,25 @@ private void RunOnSaved() { OnSaved?.Invoke(Rope.Collapse(Input.TextRope)); } + + private void UpdateFillState() + { + if (MaxInputLength != -1) + { + var inputLength = Input.TextLength; + + FillStatus.Text = Loc.GetString("paper-ui-fill-level", + ("currentLength", inputLength), + ("maxLength", MaxInputLength)); + + // Disable the save button if we've gone over the limit + SaveButton.Disabled = inputLength > MaxInputLength; + } + else + { + FillStatus.Text = ""; + SaveButton.Disabled = false; + } + } } } diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs index 8f1d0d4f820a..4de908bc3019 100644 --- a/Content.Server/Access/Systems/AgentIDCardSystem.cs +++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs @@ -32,7 +32,7 @@ public override void Initialize() private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, AfterInteractEvent args) { - if (!TryComp(args.Target, out var targetAccess) || !HasComp(args.Target) || args.Target == null) + if (args.Target == null || !args.CanReach || !TryComp(args.Target, out var targetAccess) || !HasComp(args.Target)) return; if (!TryComp(uid, out var access) || !HasComp(uid)) diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs new file mode 100644 index 000000000000..fd616a1c803d --- /dev/null +++ b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeComponent.cs @@ -0,0 +1,9 @@ +using Content.Shared.CartridgeLoader.Cartridges; +using Content.Shared.GPS; + +namespace Content.Server.CartridgeLoader.Cartridges; + +[RegisterComponent] +public sealed partial class AstroNavCartridgeComponent : Component +{ +} diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs new file mode 100644 index 000000000000..60d14789fa01 --- /dev/null +++ b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs @@ -0,0 +1,32 @@ +using Content.Shared.CartridgeLoader; +using Content.Shared.CartridgeLoader.Cartridges; +using Content.Shared.GPS.Components; + +namespace Content.Server.CartridgeLoader.Cartridges; + +public sealed class AstroNavCartridgeSystem : EntitySystem +{ + [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnCartridgeAdded); + SubscribeLocalEvent(OnCartridgeRemoved); + } + + private void OnCartridgeAdded(Entity ent, ref CartridgeAddedEvent args) + { + EnsureComp(args.Loader); + } + + private void OnCartridgeRemoved(Entity ent, ref CartridgeRemovedEvent args) + { + // only remove when the program itself is removed + if (!_cartridgeLoaderSystem.HasProgram(args.Loader)) + { + RemComp(args.Loader); + } + } +} diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index bcbc6a6144c9..fb84c785d276 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -122,6 +122,7 @@ private void OnGameChange(GameRunLevelChangedEvent ev) _configurationManager.SetCVar(CCVars.OocEnabled, false); break; case GameRunLevel.PostRound: + case GameRunLevel.PreRoundLobby: if (!_configurationManager.GetCVar(CCVars.OocEnableDuringRound)) _configurationManager.SetCVar(CCVars.OocEnabled, true); break; diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 3c59c36f77e3..b750c13e2129 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -52,7 +52,7 @@ public ServerDbBase(ISawmill opsLog) .ThenInclude(h => h.Loadouts) .ThenInclude(l => l.Groups) .ThenInclude(group => group.Loadouts) - .AsSingleQuery() + .AsSplitQuery() .SingleOrDefaultAsync(p => p.UserId == userId.UserId, cancel); if (prefs is null) diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs index d9b81c8e5a5b..04c45662272b 100644 --- a/Content.Server/Entry/IgnoredComponents.cs +++ b/Content.Server/Entry/IgnoredComponents.cs @@ -12,7 +12,6 @@ public static class IgnoredComponents "GuideHelp", "Clickable", "Icon", - "HandheldGPS", "CableVisualizer", "SolutionItemStatus", "UIFragment", diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index 0a0f2068b58e..ed2d54ffaa60 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -84,7 +84,6 @@ public override void Update(float frameTime) while (query.MoveNext(out var uid, out var comp, out var batt)) { if (!comp.AutoRecharge) continue; - if (batt.IsFullyCharged) continue; SetCharge(uid, batt.CurrentCharge + comp.AutoRechargeRate * frameTime, batt); } } @@ -138,7 +137,8 @@ public void SetCharge(EntityUid uid, float value, BatteryComponent? battery = nu var old = battery.CurrentCharge; battery.CurrentCharge = MathHelper.Clamp(value, 0, battery.MaxCharge); - if (MathHelper.CloseTo(battery.CurrentCharge, old)) + if (MathHelper.CloseTo(battery.CurrentCharge, old) && + !(old != battery.CurrentCharge && battery.CurrentCharge == battery.MaxCharge)) return; var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge); diff --git a/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs b/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs index 22a0341fcbea..39231fbe8349 100644 --- a/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs +++ b/Content.Server/VendingMachines/VendingMachineContrabandWireAction.cs @@ -7,11 +7,20 @@ namespace Content.Server.VendingMachines; [DataDefinition] public sealed partial class VendingMachineContrabandWireAction : BaseToggleWireAction { + private VendingMachineSystem _vendingMachineSystem = default!; + public override Color Color { get; set; } = Color.Green; public override string Name { get; set; } = "wire-name-vending-contraband"; public override object? StatusKey { get; } = ContrabandWireKey.StatusKey; public override object? TimeoutKey { get; } = ContrabandWireKey.TimeoutKey; + public override void Initialize() + { + base.Initialize(); + + _vendingMachineSystem = EntityManager.System(); + } + public override StatusLightState? GetLightState(Wire wire) { if (EntityManager.TryGetComponent(wire.Owner, out VendingMachineComponent? vending)) @@ -28,7 +37,7 @@ public override void ToggleValue(EntityUid owner, bool setting) { if (EntityManager.TryGetComponent(owner, out VendingMachineComponent? vending)) { - vending.Contraband = !setting; + _vendingMachineSystem.SetContraband(owner, !vending.Contraband, vending); } } diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 38407a98c729..90fe4cb7d8ae 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -192,6 +192,18 @@ public void SetShooting(EntityUid uid, bool canShoot, VendingMachineComponent? c component.CanShoot = canShoot; } + /// + /// Sets the property of the vending machine. + /// + public void SetContraband(EntityUid uid, bool contraband, VendingMachineComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + component.Contraband = contraband; + Dirty(uid, component); + } + public void Deny(EntityUid uid, VendingMachineComponent? vendComponent = null) { if (!Resolve(uid, ref vendComponent)) diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs index 9156f747f5c9..01452bdc72e0 100644 --- a/Content.Shared/Actions/BaseActionComponent.cs +++ b/Content.Shared/Actions/BaseActionComponent.cs @@ -40,6 +40,16 @@ public abstract partial class BaseActionComponent : Component /// [DataField("iconColor")] public Color IconColor = Color.White; + /// + /// The original this action was. + /// + [DataField] public Color OriginalIconColor; + + /// + /// The color the action should turn to when disabled + /// + [DataField] public Color DisabledIconColor = Color.DimGray; + /// /// Keywords that can be used to search for this action in the action menu. /// @@ -179,6 +189,8 @@ public abstract class BaseActionComponentState : ComponentState public SpriteSpecifier? Icon; public SpriteSpecifier? IconOn; public Color IconColor; + public Color OriginalIconColor; + public Color DisabledIconColor; public HashSet Keywords; public bool Enabled; public bool Toggled; @@ -209,6 +221,8 @@ protected BaseActionComponentState(BaseActionComponent component, IEntityManager Icon = component.Icon; IconOn = component.IconOn; IconColor = component.IconColor; + OriginalIconColor = component.OriginalIconColor; + DisabledIconColor = component.DisabledIconColor; Keywords = component.Keywords; Enabled = component.Enabled; Toggled = component.Toggled; diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 275634542825..76b8a1b081b4 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -69,8 +69,42 @@ public override void Initialize() SubscribeAllEvent(OnActionRequest); } + public override void Update(float frameTime) + { + base.Update(frameTime); + + var worldActionQuery = EntityQueryEnumerator(); + while (worldActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + + var instantActionQuery = EntityQueryEnumerator(); + while (instantActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + + var entityActionQuery = EntityQueryEnumerator(); + while (entityActionQuery.MoveNext(out var uid, out var action)) + { + if (IsCooldownActive(action) || !ShouldResetCharges(action)) + continue; + + ResetCharges(uid, dirty: true); + } + } + private void OnActionMapInit(EntityUid uid, BaseActionComponent component, MapInitEvent args) { + component.OriginalIconColor = component.IconColor; + if (component.Charges == null) return; @@ -326,14 +360,18 @@ public void RemoveCharges(EntityUid? actionId, int? removeCharges) Dirty(actionId.Value, action); } - public void ResetCharges(EntityUid? actionId) + public void ResetCharges(EntityUid? actionId, bool update = false, bool dirty = false) { if (!TryGetActionData(actionId, out var action)) return; action.Charges = action.MaxCharges; - UpdateAction(actionId, action); - Dirty(actionId.Value, action); + + if (update) + UpdateAction(actionId, action); + + if (dirty) + Dirty(actionId.Value, action); } private void OnActionsGetState(EntityUid uid, ActionsComponent component, ref ComponentGetState args) @@ -386,13 +424,12 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg return; var curTime = GameTiming.CurTime; - // TODO: Check for charge recovery timer - if (action.Cooldown.HasValue && action.Cooldown.Value.End > curTime) + if (IsCooldownActive(action, curTime)) return; // TODO: Replace with individual charge recovery when we have the visuals to aid it if (action is { Charges: < 1, RenewCharges: true }) - ResetCharges(actionEnt); + ResetCharges(actionEnt, true, true); BaseActionEvent? performEvent = null; @@ -1072,4 +1109,19 @@ public void SetEntityIcon(EntityUid uid, EntityUid? icon, BaseActionComponent? a action.EntityIcon = icon; Dirty(uid, action); } + + /// + /// Checks if the action has a cooldown and if it's still active + /// + protected bool IsCooldownActive(BaseActionComponent action, TimeSpan? curTime = null) + { + curTime ??= GameTiming.CurTime; + // TODO: Check for charge recovery timer + return action.Cooldown.HasValue && action.Cooldown.Value.End > curTime; + } + + protected bool ShouldResetCharges(BaseActionComponent action) + { + return action is { Charges: < 1, RenewCharges: true }; + } } diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs index f5df04037ee6..2b10b41fee8d 100644 --- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Access.Components; using Content.Shared.Clothing.Components; +using Content.Shared.Contraband; using Content.Shared.Inventory; using Content.Shared.Inventory.Events; using Content.Shared.Item; @@ -13,6 +14,7 @@ public abstract class SharedChameleonClothingSystem : EntitySystem [Dependency] private readonly IComponentFactory _factory = default!; [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly ClothingSystem _clothingSystem = default!; + [Dependency] private readonly ContrabandSystem _contraband = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly SharedItemSystem _itemSystem = default!; [Dependency] private readonly TagSystem _tag = default!; @@ -68,6 +70,17 @@ protected void UpdateVisuals(EntityUid uid, ChameleonClothingComponent component { _clothingSystem.CopyVisuals(uid, otherClothing, clothing); } + + // properly mark contraband + if (proto.TryGetComponent("Contraband", out ContrabandComponent? contra)) + { + EnsureComp(uid, out var current); + _contraband.CopyDetails(uid, contra, current); + } + else + { + RemComp(uid); + } } protected virtual void UpdateSprite(EntityUid uid, EntityPrototype proto) { } diff --git a/Content.Shared/Contraband/ContrabandSystem.cs b/Content.Shared/Contraband/ContrabandSystem.cs index 22181ce99ada..e6931f2860a1 100644 --- a/Content.Shared/Contraband/ContrabandSystem.cs +++ b/Content.Shared/Contraband/ContrabandSystem.cs @@ -33,6 +33,16 @@ private void SetContrabandExamine(bool val) _contrabandExamineEnabled = val; } + public void CopyDetails(EntityUid uid, ContrabandComponent other, ContrabandComponent? contraband = null) + { + if (!Resolve(uid, ref contraband)) + return; + + contraband.Severity = other.Severity; + contraband.AllowedDepartments = other.AllowedDepartments; + Dirty(uid, contraband); + } + private void OnExamined(Entity ent, ref ExaminedEvent args) { if (!_contrabandExamineEnabled) @@ -45,7 +55,7 @@ private void OnExamined(Entity ent, ref ExaminedEvent args) using (args.PushGroup(nameof(ContrabandComponent))) { var severity = _proto.Index(ent.Comp.Severity); - if (severity.ShowDepartments && ent.Comp is { AllowedDepartments: not null }) + if (severity.ShowDepartments && ent.Comp is { AllowedDepartments: not null }) { // TODO shouldn't department prototypes have a localized name instead of just using the ID for this? var list = ContentLocalizationManager.FormatList(ent.Comp.AllowedDepartments.Select(p => Loc.GetString($"department-{p.Id}")).ToList()); diff --git a/Content.Shared/GPS/Components/HandheldGPSComponent.cs b/Content.Shared/GPS/Components/HandheldGPSComponent.cs new file mode 100644 index 000000000000..a0af09098676 --- /dev/null +++ b/Content.Shared/GPS/Components/HandheldGPSComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.GPS.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class HandheldGPSComponent : Component +{ + [DataField] + public float UpdateRate = 1.5f; +} diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs index 0f4bfef983dc..211eb7eba814 100644 --- a/Content.Shared/Paper/PaperSystem.cs +++ b/Content.Shared/Paper/PaperSystem.cs @@ -201,7 +201,7 @@ public bool TryStamp(Entity entity, StampDisplayInfo stampInfo, public void SetContent(Entity entity, string content) { - entity.Comp.Content = content + '\n'; + entity.Comp.Content = content; Dirty(entity); UpdateUserInterface(entity); diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index d6fde292a147..ca4b788867f5 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -453,7 +453,7 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt } //If there's only one then let's be generous - if (_entList.Count > 1) + if (_entList.Count >= 1) { var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(_entList)), uid, target: uid) { diff --git a/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs b/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs deleted file mode 100644 index 3c30738857bd..000000000000 --- a/Content.Shared/Tools/Components/SharedHandheldGPSComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ - -namespace Content.Shared.GPS -{ - public abstract partial class SharedHandheldGPSComponent : Component - { - [DataField("updateRate")] - public float UpdateRate = 1.5f; - } -} diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index a3c7949600a1..50023a023ab1 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -41,6 +41,7 @@ public sealed partial class VendingMachineComponent : Component [DataField, AutoNetworkedField] public Dictionary ContrabandInventory = new(); + [DataField, AutoNetworkedField] public bool Contraband; public bool Ejecting; diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4097d8d4a623..6f24bbf9aa6e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,107 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Added health examine for caustic and cold damage. - type: Add - id: 6926 - time: '2024-07-17T06:19:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29989 -- author: lzk228 - changes: - - message: Surgery saws now are normal-sized (no more pocket circular saw). - type: Tweak - id: 6927 - time: '2024-07-17T06:26:10.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29995 -- author: Winkarst-cpu - changes: - - message: The super door remote is now able to control Syndicate doors. - type: Fix - id: 6928 - time: '2024-07-17T13:50:25.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30033 -- author: Errant - changes: - - message: Vox are temporarily removed from Space Ninjas and all Unknown Shuttle - ghostroles, until code supports giving them species-specific gear. - type: Tweak - id: 6929 - time: '2024-07-17T22:04:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30099 -- author: Cojoke-dot - changes: - - message: You can no longer teleport objects that should not be in other objects - into other objects with the Quantum Spin Inverter - type: Fix - id: 6930 - time: '2024-07-18T00:40:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29200 -- author: Plykiya - changes: - - message: Stun batons no longer use up charges when hitting objects without stamina. - type: Fix - id: 6931 - time: '2024-07-18T00:48:09.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30136 -- author: Sh18RW - changes: - - message: Moth can't eat boots with an item more - type: Fix - id: 6932 - time: '2024-07-18T22:34:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30019 -- author: portfiend - changes: - - message: Reptilians display correct mask sprites in character customization screen. - type: Fix - id: 6933 - time: '2024-07-18T22:36:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30095 -- author: Plykiya - changes: - - message: You no longer deal double damage to your first target when throwing an - item. - type: Fix - id: 6934 - time: '2024-07-19T01:08:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30115 -- author: deepdarkdepths - changes: - - message: Removed the description about geras in the Slime guidebook section. - type: Remove - id: 6935 - time: '2024-07-19T09:04:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30140 -- author: Blackern5000 - changes: - - message: Nuclear operatives are now able to purchase durable armor which is NOT - space-proof. - type: Add - id: 6936 - time: '2024-07-19T09:38:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29845 -- author: Plykiya, slarticodefast - changes: - - message: Explosive pens now correctly embed into their target. - type: Fix - id: 6937 - time: '2024-07-19T09:42:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30112 -- author: ThatOneEnby1337 - changes: - - message: News Reporters are now able to use markup tags in their reports without - bricking the PDAs of readers - type: Fix - id: 6938 - time: '2024-07-19T14:18:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30169 -- author: themias - changes: - - message: Mailing units are functional again - type: Fix - id: 6939 - time: '2024-07-20T02:31:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30174 - author: Ghagliiarghii changes: - message: Nuclear Operatives' Reinforcements now have a PDA! @@ -3924,4 +3821,109 @@ Entries: type: Add id: 7425 time: '2024-09-23T13:08:11.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32302 \ No newline at end of file + url: https://github.com/space-wizards/space-station-14/pull/32302 +- author: lzk228 + changes: + - message: Cadet PDA now has wanted list cartridge preinstalled. + type: Fix + id: 7426 + time: '2024-09-23T21:49:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32399 +- author: Vasilis + changes: + - message: Removed the age requirement for command jobs. + type: Tweak + id: 7427 + time: '2024-09-24T00:31:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32340 +- author: whatston3 + changes: + - message: Area insert items can pick up single item sets when clicking on the floor. + type: Fix + id: 7428 + time: '2024-09-24T14:23:48.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32153 +- author: LordEclipse + changes: + - message: The Antimov Law Board is now available in both the Traitor and Nuclear + Operative Uplinks, 14 and 24 TC respectively. + type: Add + id: 7429 + time: '2024-09-24T15:06:59.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31916 +- author: lzk228 + changes: + - message: Freezer electronics added to autolathe, with which you can craft locker + freezer or crate freezer. + type: Add + id: 7430 + time: '2024-09-24T15:19:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32277 +- author: MilonPL + changes: + - message: Paper will no longer stay on fire indefinitely. + type: Fix + id: 7431 + time: '2024-09-24T15:48:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32412 +- author: ArchRBX + changes: + - message: The AstroNav PDA cartridge has now been added, which turns your PDA into + a handheld GPS + type: Add + - message: The AstroNav cartridge has been added to the QM locker, and comes preinstalled + on salvage PDA's + type: Add + id: 7432 + time: '2024-09-24T17:02:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32194 +- author: PJB3005 + changes: + - message: Fixed some people's preferences taking ages to load, hopefully. + type: Fix + id: 7433 + time: '2024-09-24T20:43:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32434 +- author: Moomoobeef + changes: + - message: Most papers are no longer considered trash. + type: Tweak + id: 7434 + time: '2024-09-24T21:58:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32343 +- author: goet + changes: + - message: Vending machines can be hacked again. + type: Fix + id: 7435 + time: '2024-09-25T05:21:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32431 +- author: themias + changes: + - message: Agent ID card can now only copy access within interaction range. + type: Fix + id: 7436 + time: '2024-09-25T15:41:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32445 +- author: Myra + changes: + - message: Silicon with no laws will not have binary channel access. + type: Remove + id: 7437 + time: '2024-09-25T16:49:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32385 +- author: august-sun + changes: + - message: Rolling pins are now craftable. + type: Tweak + id: 7438 + time: '2024-09-25T17:27:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32285 +- author: BramvanZijp + changes: + - message: Fixed an issue that caused Doctors Delight to metabolize twice the normal + speed, which also halved its effectiveness. + type: Fix + id: 7439 + time: '2024-09-25T17:39:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32297 \ No newline at end of file diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl index 2db27f5be09a..804da0992fa3 100644 --- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl +++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl @@ -20,6 +20,8 @@ log-probe-label-time = Time log-probe-label-accessor = Accessed by log-probe-label-number = # +astro-nav-program-name = AstroNav + # Wanted list cartridge wanted-list-program-name = Wanted list wanted-list-label-no-records = It's all right, cowboy diff --git a/Resources/Locale/en-US/paper/paper-component.ftl b/Resources/Locale/en-US/paper/paper-component.ftl index c2d9d5712bf6..7425ea2da164 100644 --- a/Resources/Locale/en-US/paper/paper-component.ftl +++ b/Resources/Locale/en-US/paper/paper-component.ftl @@ -11,6 +11,9 @@ paper-component-examine-detail-stamped-by = {CAPITALIZE(THE($paper))} {CONJUGATE paper-component-action-stamp-paper-other = {CAPITALIZE(THE($user))} stamps {THE($target)} with {THE($stamp)}. paper-component-action-stamp-paper-self = You stamp {THE($target)} with {THE($stamp)}. +# Indicator to show how full a paper is +paper-ui-fill-level = {$currentLength}/{$maxLength} + paper-ui-save-button = Save ({$keybind}) paper-tamper-proof-modified-message = This page was written using tamper-proof ink. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 90676fbfe35d..45d7ad28165e 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -166,6 +166,9 @@ uplink-syndicate-martyr-module-desc = Turn your emagged borg friend into a walki uplink-singularity-beacon-name = Singularity Beacon uplink-singularity-beacon-desc = A device that attracts singularities. Has to be anchored and powered. Causes singularities to grow when consumed. +uplink-antimov-law-name = Antimov Law Circuit +uplink-antimov-law-desc = A very dangerous Lawset to use when you want to cause the A.I. to go haywire, use with caution. + # Implants uplink-storage-implanter-name = Storage Implanter uplink-storage-implanter-desc = Hide goodies inside of yourself with new bluespace technology! diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index b8cf3c6fc000..7709234a6a15 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -81,7 +81,7 @@ entities: version: 6 -2,1: ind: -2,1 - tiles: WQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAWQAAAAACWQAAAAABdgAAAAADdgAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAACdgAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAACeQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAADeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAHQAAAAABdgAAAAABdgAAAAADUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAACdgAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAAAWQAAAAADHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACHQAAAAABeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: WQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAWQAAAAACWQAAAAABdgAAAAADdgAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAACdgAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAACeQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAADeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAHQAAAAABdgAAAAABdgAAAAADUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAACdgAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAAAWQAAAAADHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACHQAAAAABeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -2,0: ind: -2,0 @@ -161,7 +161,7 @@ entities: version: 6 2,-2: ind: 2,-2 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAACeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAADeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAADeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFCwAAAAAACwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAACeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAADeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAADeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFegAAAAAAegAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,-3: ind: 2,-3 @@ -193,11 +193,11 @@ entities: version: 6 -3,1: ind: -3,1 - tiles: eQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAACUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAACUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAABwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAaAAAAAAA + tiles: eQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAABwAAAAAABwAAAAAAeQAAAAAATQAAAAAAHQAAAAACHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAATQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeQAAAAAAeQAAAAAATQAAAAAAHQAAAAAATQAAAAAAHQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAATQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAATQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAABwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAaAAAAAAA version: 6 -3,0: ind: -3,0 - tiles: aAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABaAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABeQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAaAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAABaAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAACWQAAAAADaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAACHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAABUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAHBwAAAAAABwAAAAAAeQAAAAAAHQAAAAABUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAA + tiles: aAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABaAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABeQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAaAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAABaAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAACWQAAAAADaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAACHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAABwAAAAAABwAAAAAAeQAAAAAATQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAHBwAAAAAAeQAAAAAATQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAA version: 6 -3,-3: ind: -3,-3 @@ -209,7 +209,7 @@ entities: version: 6 -4,-1: ind: -4,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAWQAAAAACWQAAAAABWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAACWQAAAAADWQAAAAABWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAACeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAADeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAADAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAACwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAACwAAAAAACwAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACeQAAAAAAWQAAAAACWQAAAAABWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAACWQAAAAADWQAAAAABWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAACeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAADeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAADAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAA version: 6 -4,-2: ind: -4,-2 @@ -294,7 +294,6 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 1605: -35,19 1864: 47,-4 1865: 49,-4 1866: 55,-4 @@ -318,6 +317,7 @@ entities: 1871: 55,-2 1872: 49,-2 2080: 47,-2 + 2188: -35.0297,19.625114 - node: color: '#FFFFFFFF' id: Bot @@ -377,7 +377,6 @@ entities: 1234: -16,-26 1531: 2,-36 1532: -15,-14 - 1604: -37,20 1725: -37,4 1726: -37,5 1735: -32,4 @@ -397,6 +396,10 @@ entities: 2120: -40,-16 2122: -51,0 2128: -58,0 + 2152: -37,22 + 2153: -36,22 + 2182: -34,20 + 2183: -38,15 - node: angle: 4.71238898038469 rad color: '#DE3A3AFF' @@ -414,8 +417,6 @@ entities: 1599: -32,-10 1600: -33,-10 1601: -34,-10 - 1602: -36,21 - 1603: -37,21 1742: -35,4 1743: -34,5 1913: 24,15 @@ -1258,7 +1259,6 @@ entities: 297: 30,1 444: -5,-26 445: -3,-31 - 559: -33,17 560: -35,13 612: -27,28 613: -31,28 @@ -1454,7 +1454,6 @@ entities: 295: 29,4 296: 30,4 432: -3,-25 - 551: -35,17 600: -27,32 601: -28,32 602: -29,32 @@ -1557,7 +1556,6 @@ entities: 290: 29,2 291: 28,2 435: -3,-30 - 552: -35,14 606: -32,29 607: -31,29 608: -30,29 @@ -1670,8 +1668,6 @@ entities: 545: -32,18 546: -32,19 547: -32,20 - 555: -36,15 - 556: -36,16 592: -32,26 593: -32,27 594: -28,26 @@ -1755,12 +1751,11 @@ entities: 441: -2,-28 442: -2,-27 443: -2,-26 - 557: -34,15 - 558: -34,16 596: -26,26 597: -26,27 598: -30,26 599: -30,27 + 2163: -34,15 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale90 @@ -1984,6 +1979,9 @@ entities: 528: -27,17 544: -32,17 616: -26,10 + 2160: -35,16 + 2161: -36,16 + 2162: -37,16 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale @@ -2265,6 +2263,14 @@ entities: 542: -32,10 548: -32,15 615: -26,11 + 2164: -35,14 + 2165: -36,14 + 2166: -37,14 + 2172: -35,18 + 2176: -34,18 + 2177: -36,18 + 2180: -30,11 + 2184: -33,18 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale270 @@ -2443,6 +2449,10 @@ entities: 540: -29,17 541: -29,20 617: -27,10 + 2173: -35,18 + 2175: -34,18 + 2178: -36,18 + 2185: -33,18 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 @@ -2560,7 +2570,6 @@ entities: decals: 286: 27,4 430: -4,-25 - 550: -36,17 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale @@ -2605,7 +2614,7 @@ entities: decals: 288: 31,2 434: -2,-30 - 553: -34,14 + 2159: -34,14 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale180 @@ -2650,7 +2659,6 @@ entities: decals: 285: 27,2 433: -4,-30 - 554: -36,14 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale270 @@ -2696,7 +2704,7 @@ entities: decals: 287: 31,4 431: -2,-25 - 549: -34,17 + 2158: -34,16 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale90 @@ -2774,11 +2782,17 @@ entities: id: WarnCornerGreyscaleSW decals: 1174: -13,-24 + - node: + color: '#FFFFFFFF' + id: WarnCornerNE + decals: + 2144: -35,21 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: 1235: -15,-29 + 2143: -37,21 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE @@ -2798,12 +2812,14 @@ entities: decals: 935: 23,3 1901: 26,16 + 2149: -37,21 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: 934: 25,3 2132: -56,1 + 2150: -35,21 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -2815,6 +2831,11 @@ entities: id: WarnEnd decals: 42: 7,15 + - node: + color: '#FFFFFFFF' + id: WarnEndS + decals: + 2142: -37,20 - node: color: '#52B4E996' id: WarnFullGreyscale @@ -2836,6 +2857,7 @@ entities: 2097: -60,0 2098: -60,1 2099: -60,2 + 2146: -35,20 - node: color: '#52B4E996' id: WarnLineGreyscaleE @@ -2904,6 +2926,7 @@ entities: 2078: -45,-4 2129: -58,1 2130: -57,1 + 2148: -36,21 - node: color: '#FFFFFFFF' id: WarnLineS @@ -2913,6 +2936,11 @@ entities: 2131: -56,0 2133: -59,4 2140: -59,5 + 2147: -35,20 + 2167: -37,14 + 2168: -37,15 + 2169: -37,16 + 2179: -36,18 - node: color: '#FFFFFFFF' id: WarnLineW @@ -2933,6 +2961,7 @@ entities: 2094: -49,5 2095: -48,5 2138: -56,5 + 2145: -36,21 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -2945,10 +2974,6 @@ entities: 218: 14,44 219: 13,44 257: 10,50 - 584: -34,21 - 585: -35,21 - 586: -36,21 - 587: -37,21 871: -53,-12 872: -54,-12 873: -55,-12 @@ -3005,10 +3030,6 @@ entities: 427: 24,-23 428: 25,-23 429: 26,-23 - 498: -34,19 - 499: -35,19 - 500: -36,19 - 501: -37,19 590: -30,22 591: -31,22 724: -43,-4 @@ -3454,7 +3475,7 @@ entities: -8,3: 0: 65535 -9,4: - 0: 29431 + 0: 12071 -8,5: 0: 65391 -8,6: @@ -4188,14 +4209,11 @@ entities: 1: 784 -11,4: 6: 546 - 0: 8 -11,6: 0: 49152 -11,3: 0: 34823 1: 1792 - -10,5: - 0: 152 -11,7: 0: 2184 -10,7: @@ -4203,11 +4221,13 @@ entities: -10,6: 0: 3296 -10,4: - 0: 32904 + 0: 2060 + -10,5: + 0: 3276 -10,3: - 0: 35087 + 0: 52495 -9,5: - 0: 119 + 0: 1911 -9,6: 0: 4400 -13,0: @@ -4296,6 +4316,8 @@ entities: 0: 5392 -15,-2: 0: 2295 + -15,-1: + 0: 1 -15,-4: 0: 16384 -14,-2: @@ -4555,6 +4577,7 @@ entities: - type: GasTileOverlay - type: SpreaderGrid - type: GridPathfinding + - type: NavMap - proto: AcousticGuitarInstrument entities: - uid: 1755 @@ -4866,6 +4889,9 @@ entities: - 7873 - 7887 - 7886 + - 7743 + - 13696 + - 13697 - uid: 12213 components: - type: Transform @@ -4876,18 +4902,6 @@ entities: - 7905 - 7907 - 12214 - - uid: 12215 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -37.5,15.5 - parent: 4812 - - type: DeviceList - devices: - - 12216 - - 12212 - - 7906 - - 7908 - uid: 12219 components: - type: Transform @@ -5504,6 +5518,18 @@ entities: - 12688 - 12764 - 12766 + - uid: 13156 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -38.5,15.5 + parent: 4812 + - type: DeviceList + devices: + - 12212 + - 13522 + - 7908 + - 5174 - uid: 13204 components: - type: Transform @@ -5535,17 +5561,30 @@ entities: - 9504 - 9421 - 13408 + - 13683 + - 13682 + - uid: 13677 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,21.5 + parent: 4812 + - type: DeviceList + devices: + - 13676 + - 10972 + - 8372 - proto: AirAlarmElectronics entities: - uid: 10719 components: - type: Transform - pos: -30.29477,5.0635805 + pos: -31.969843,3.438716 parent: 4812 - uid: 10720 components: - type: Transform - pos: -30.216644,4.9385805 + pos: -31.876093,3.44914 parent: 4812 - proto: AirCanister entities: @@ -5608,20 +5647,21 @@ entities: parent: 4812 - proto: AirlockArmoryGlassLocked entities: - - uid: 7800 + - uid: 7802 components: - type: Transform - pos: -34.5,18.5 + pos: -34.5,13.5 parent: 4812 - - uid: 7801 + - uid: 10941 components: - type: Transform - pos: -32.5,17.5 + rot: 3.141592653589793 rad + pos: -34.5,19.5 parent: 4812 - - uid: 7802 + - uid: 12471 components: - type: Transform - pos: -34.5,13.5 + pos: -34.5,17.5 parent: 4812 - proto: AirlockAtmosphericsGlassLocked entities: @@ -5831,11 +5871,6 @@ entities: parent: 4812 - proto: AirlockCommandLocked entities: - - uid: 5174 - components: - - type: Transform - pos: -24.5,23.5 - parent: 4812 - uid: 11928 components: - type: Transform @@ -6637,23 +6672,28 @@ entities: parent: 4812 - proto: AirlockHeadOfSecurityGlassLocked entities: - - uid: 7935 + - uid: 2965 components: - type: Transform pos: -22.5,26.5 parent: 4812 - proto: AirlockHeadOfSecurityLocked entities: - - uid: 7934 + - uid: 2918 components: - type: Transform - pos: -18.5,25.5 + pos: -24.5,23.5 parent: 4812 - - uid: 7936 + - uid: 4138 components: - type: Transform pos: -22.5,21.5 parent: 4812 + - uid: 7934 + components: + - type: Transform + pos: -18.5,25.5 + parent: 4812 - uid: 8242 components: - type: Transform @@ -7266,6 +7306,11 @@ entities: - type: Transform pos: -30.5,25.5 parent: 4812 + - uid: 12052 + components: + - type: Transform + pos: -32.5,18.5 + parent: 4812 - proto: AirlockServiceLocked entities: - uid: 6675 @@ -7315,6 +7360,15 @@ entities: - type: DeviceNetwork deviceLists: - 13204 + - uid: 5174 + components: + - type: Transform + pos: -35.5,15.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13156 + - 13155 - uid: 8805 components: - type: Transform @@ -7333,6 +7387,7 @@ entities: - type: DeviceNetwork deviceLists: - 13607 + - 13681 - uid: 12170 components: - type: Transform @@ -7405,16 +7460,14 @@ entities: - type: Transform pos: -31.5,16.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 12210 - uid: 12214 components: - type: Transform pos: -38.5,11.5 parent: 4812 - - uid: 12216 - components: - - type: Transform - pos: -35.5,16.5 - parent: 4812 - uid: 12218 components: - type: Transform @@ -7700,6 +7753,15 @@ entities: deviceLists: - 12697 - 9224 + - uid: 13676 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,21.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13677 - proto: AltarSpawner entities: - uid: 4008 @@ -9007,6 +9069,11 @@ entities: - type: Transform pos: 26.5,6.5 parent: 4812 + - uid: 7739 + components: + - type: Transform + pos: -39.5,18.5 + parent: 4812 - uid: 8460 components: - type: Transform @@ -9297,6 +9364,11 @@ entities: - type: Transform pos: -43.5,-32.5 parent: 4812 + - uid: 9626 + components: + - type: Transform + pos: -39.5,17.5 + parent: 4812 - uid: 9638 components: - type: Transform @@ -9592,31 +9664,6 @@ entities: - type: Transform pos: -58.5,-8.5 parent: 4812 - - uid: 10926 - components: - - type: Transform - pos: -38.5,14.5 - parent: 4812 - - uid: 10927 - components: - - type: Transform - pos: -38.5,15.5 - parent: 4812 - - uid: 10928 - components: - - type: Transform - pos: -38.5,16.5 - parent: 4812 - - uid: 10929 - components: - - type: Transform - pos: -38.5,17.5 - parent: 4812 - - uid: 10941 - components: - - type: Transform - pos: -33.5,24.5 - parent: 4812 - uid: 10942 components: - type: Transform @@ -9632,11 +9679,6 @@ entities: - type: Transform pos: -33.5,27.5 parent: 4812 - - uid: 10945 - components: - - type: Transform - pos: -34.5,24.5 - parent: 4812 - uid: 10947 components: - type: Transform @@ -9692,11 +9734,6 @@ entities: - type: Transform pos: -35.5,30.5 parent: 4812 - - uid: 10963 - components: - - type: Transform - pos: -35.5,24.5 - parent: 4812 - uid: 10965 components: - type: Transform @@ -9707,56 +9744,11 @@ entities: - type: Transform pos: -39.5,16.5 parent: 4812 - - uid: 10967 - components: - - type: Transform - pos: -39.5,17.5 - parent: 4812 - - uid: 10969 - components: - - type: Transform - pos: -39.5,19.5 - parent: 4812 - - uid: 10970 - components: - - type: Transform - pos: -39.5,20.5 - parent: 4812 - - uid: 10972 - components: - - type: Transform - pos: -39.5,22.5 - parent: 4812 - - uid: 10973 - components: - - type: Transform - pos: -39.5,23.5 - parent: 4812 - - uid: 10974 - components: - - type: Transform - pos: -39.5,24.5 - parent: 4812 - - uid: 10975 - components: - - type: Transform - pos: -38.5,24.5 - parent: 4812 - - uid: 10977 - components: - - type: Transform - pos: -36.5,24.5 - parent: 4812 - uid: 10982 components: - type: Transform pos: -40.5,23.5 parent: 4812 - - uid: 10983 - components: - - type: Transform - pos: -39.5,18.5 - parent: 4812 - uid: 10984 components: - type: Transform @@ -9867,11 +9859,6 @@ entities: - type: Transform pos: -40.5,21.5 parent: 4812 - - uid: 11014 - components: - - type: Transform - pos: -37.5,24.5 - parent: 4812 - uid: 11016 components: - type: Transform @@ -10312,6 +10299,11 @@ entities: - type: Transform pos: 27.5,8.5 parent: 4812 + - uid: 12470 + components: + - type: Transform + pos: -40.5,16.5 + parent: 4812 - uid: 12678 components: - type: Transform @@ -10694,11 +10686,6 @@ entities: - type: Transform pos: -56.5,-1.5 parent: 4812 - - uid: 13522 - components: - - type: Transform - pos: -59.5,-3.5 - parent: 4812 - uid: 13523 components: - type: Transform @@ -11935,13 +11922,6 @@ entities: - type: Transform pos: -40.434937,-35.118546 parent: 4812 -- proto: BoxShotgunIncendiary - entities: - - uid: 12055 - components: - - type: Transform - pos: -35.55101,19.647282 - parent: 4812 - proto: BoxSterileMask entities: - uid: 9028 @@ -17664,6 +17644,16 @@ entities: - type: Transform pos: -11.5,-15.5 parent: 4812 + - uid: 7800 + components: + - type: Transform + pos: -36.5,21.5 + parent: 4812 + - uid: 8057 + components: + - type: Transform + pos: -35.5,21.5 + parent: 4812 - uid: 8061 components: - type: Transform @@ -17874,11 +17864,6 @@ entities: - type: Transform pos: -34.5,20.5 parent: 4812 - - uid: 8104 - components: - - type: Transform - pos: -35.5,20.5 - parent: 4812 - uid: 8105 components: - type: Transform @@ -20989,6 +20974,11 @@ entities: - type: Transform pos: -60.5,5.5 parent: 4812 + - uid: 13631 + components: + - type: Transform + pos: -34.5,21.5 + parent: 4812 - uid: 13660 components: - type: Transform @@ -21004,6 +20994,56 @@ entities: - type: Transform pos: -55.5,6.5 parent: 4812 + - uid: 13699 + components: + - type: Transform + pos: -55.5,9.5 + parent: 4812 + - uid: 13700 + components: + - type: Transform + pos: -56.5,9.5 + parent: 4812 + - uid: 13701 + components: + - type: Transform + pos: -57.5,9.5 + parent: 4812 + - uid: 13702 + components: + - type: Transform + pos: -58.5,9.5 + parent: 4812 + - uid: 13703 + components: + - type: Transform + pos: -59.5,9.5 + parent: 4812 + - uid: 13704 + components: + - type: Transform + pos: -60.5,9.5 + parent: 4812 + - uid: 13705 + components: + - type: Transform + pos: -58.5,0.5 + parent: 4812 + - uid: 13706 + components: + - type: Transform + pos: -59.5,0.5 + parent: 4812 + - uid: 13707 + components: + - type: Transform + pos: -60.5,0.5 + parent: 4812 + - uid: 13708 + components: + - type: Transform + pos: -61.5,0.5 + parent: 4812 - proto: CableApcStack entities: - uid: 6196 @@ -24557,6 +24597,11 @@ entities: - type: Transform pos: -15.5,-18.5 parent: 4812 + - uid: 732 + components: + - type: Transform + pos: -34.5,15.5 + parent: 4812 - uid: 971 components: - type: Transform @@ -26332,6 +26377,21 @@ entities: - type: Transform pos: -1.5,-20.5 parent: 4812 + - uid: 7801 + components: + - type: Transform + pos: -34.5,12.5 + parent: 4812 + - uid: 7906 + components: + - type: Transform + pos: -34.5,17.5 + parent: 4812 + - uid: 7936 + components: + - type: Transform + pos: -34.5,13.5 + parent: 4812 - uid: 7986 components: - type: Transform @@ -26605,7 +26665,7 @@ entities: - uid: 8040 components: - type: Transform - pos: -33.5,14.5 + pos: -34.5,18.5 parent: 4812 - uid: 8041 components: @@ -26617,56 +26677,21 @@ entities: - type: Transform pos: -34.5,14.5 parent: 4812 - - uid: 8043 - components: - - type: Transform - pos: -35.5,14.5 - parent: 4812 - uid: 8044 components: - type: Transform pos: -35.5,13.5 parent: 4812 - - uid: 8045 - components: - - type: Transform - pos: -35.5,15.5 - parent: 4812 - uid: 8046 components: - type: Transform - pos: -35.5,16.5 + pos: -34.5,19.5 parent: 4812 - uid: 8047 components: - type: Transform pos: -35.5,17.5 parent: 4812 - - uid: 8048 - components: - - type: Transform - pos: -35.5,18.5 - parent: 4812 - - uid: 8049 - components: - - type: Transform - pos: -33.5,15.5 - parent: 4812 - - uid: 8050 - components: - - type: Transform - pos: -33.5,16.5 - parent: 4812 - - uid: 8051 - components: - - type: Transform - pos: -33.5,17.5 - parent: 4812 - - uid: 8052 - components: - - type: Transform - pos: -33.5,18.5 - parent: 4812 - uid: 8053 components: - type: Transform @@ -26677,11 +26702,6 @@ entities: - type: Transform pos: -33.5,20.5 parent: 4812 - - uid: 8055 - components: - - type: Transform - pos: -32.5,19.5 - parent: 4812 - uid: 8056 components: - type: Transform @@ -26692,6 +26712,11 @@ entities: - type: Transform pos: -31.5,19.5 parent: 4812 + - uid: 8104 + components: + - type: Transform + pos: -33.5,17.5 + parent: 4812 - uid: 8177 components: - type: Transform @@ -27392,6 +27417,11 @@ entities: - type: Transform pos: -38.5,1.5 parent: 4812 + - uid: 12145 + components: + - type: Transform + pos: -35.5,19.5 + parent: 4812 - uid: 12381 components: - type: Transform @@ -27402,6 +27432,11 @@ entities: - type: Transform pos: -45.5,5.5 parent: 4812 + - uid: 12663 + components: + - type: Transform + pos: -34.5,16.5 + parent: 4812 - uid: 12699 components: - type: Transform @@ -27642,6 +27677,21 @@ entities: - type: Transform pos: -55.5,6.5 parent: 4812 + - uid: 13693 + components: + - type: Transform + pos: -33.5,16.5 + parent: 4812 + - uid: 13694 + components: + - type: Transform + pos: -32.5,16.5 + parent: 4812 + - uid: 13695 + components: + - type: Transform + pos: -32.5,15.5 + parent: 4812 - proto: CableMVStack entities: - uid: 8586 @@ -30536,12 +30586,6 @@ entities: - type: Transform pos: -17.5,15.5 parent: 4812 - - uid: 8338 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -33.5,15.5 - parent: 4812 - uid: 8366 components: - type: Transform @@ -30553,6 +30597,12 @@ entities: - type: Transform pos: -30.5,1.5 parent: 4812 + - uid: 9658 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,15.5 + parent: 4812 - uid: 9878 components: - type: Transform @@ -32367,7 +32417,7 @@ entities: - uid: 8443 components: - type: Transform - pos: -36.423813,15.378265 + pos: -35.493202,16.440695 parent: 4812 - proto: ClothingHandsGlovesColorGray entities: @@ -32440,13 +32490,6 @@ entities: - type: Transform pos: 13.532155,-11.236504 parent: 4812 -- proto: ClothingHeadHatBeretWarden - entities: - - uid: 12145 - components: - - type: Transform - pos: -35.744057,17.561283 - parent: 4812 - proto: ClothingHeadHatCone entities: - uid: 11339 @@ -32622,6 +32665,18 @@ entities: - type: Transform pos: -10.496132,3.670351 parent: 4812 +- proto: ClothingHeadHelmetRiot + entities: + - uid: 8050 + components: + - type: Transform + pos: -33.264034,22.538214 + parent: 4812 + - uid: 8331 + components: + - type: Transform + pos: -33.534866,22.538214 + parent: 4812 - proto: ClothingHeadHelmetSyndicate entities: - uid: 11672 @@ -32816,58 +32871,36 @@ entities: - type: Transform pos: -43.53869,-26.441507 parent: 4812 -- proto: ClothingOuterArmorBasic - entities: - - uid: 9636 - components: - - type: Transform - pos: -33.593445,20.66048 - parent: 4812 - - uid: 9658 - components: - - type: Transform - pos: -33.593445,20.66048 - parent: 4812 - - uid: 9971 - components: - - type: Transform - pos: -33.593445,20.66048 - parent: 4812 - proto: ClothingOuterArmorBulletproof entities: - - uid: 9972 - components: - - type: Transform - pos: -35.562195,19.41048 - parent: 4812 - - uid: 9990 + - uid: 8049 components: - type: Transform - pos: -35.562195,19.41048 + pos: -33.441116,22.298464 parent: 4812 - - uid: 9992 + - uid: 8145 components: - type: Transform - pos: -35.562195,19.41048 + pos: -33.211952,22.277617 parent: 4812 - proto: ClothingOuterArmorReflective entities: - uid: 10685 components: - type: Transform - pos: -33.364815,20.521324 + pos: -33.774452,22.319311 parent: 4812 - proto: ClothingOuterArmorRiot entities: - uid: 10958 components: - type: Transform - pos: -33.39286,20.650888 + pos: -33.732784,22.652876 parent: 4812 - uid: 10976 components: - type: Transform - pos: -33.627235,20.729013 + pos: -33.336952,22.652876 parent: 4812 - proto: ClothingOuterCoatBomber entities: @@ -32920,18 +32953,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingOuterHardsuitSecurity - entities: - - uid: 10602 - components: - - type: Transform - pos: -36.600456,17.618195 - parent: 4812 - - uid: 12429 - components: - - type: Transform - pos: -36.45983,17.524445 - parent: 4812 - proto: ClothingOuterHardsuitSpatio entities: - uid: 12424 @@ -33522,6 +33543,12 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,-26.5 parent: 4812 + - uid: 8143 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,14.5 + parent: 4812 - uid: 8264 components: - type: Transform @@ -33558,17 +33585,17 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,23.5 parent: 4812 - - uid: 8331 - components: - - type: Transform - pos: -33.5,16.5 - parent: 4812 - uid: 8365 components: - type: Transform rot: 3.141592653589793 rad pos: -25.5,10.5 parent: 4812 + - uid: 12631 + components: + - type: Transform + pos: -33.5,16.5 + parent: 4812 - proto: ComputerFrame entities: - uid: 11147 @@ -33745,11 +33772,11 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-26.5 parent: 4812 - - uid: 8332 + - uid: 8337 components: - type: Transform rot: 3.141592653589793 rad - pos: -33.5,14.5 + pos: -35.5,14.5 parent: 4812 - proto: ComputerTechnologyDiskTerminal entities: @@ -34245,6 +34272,13 @@ entities: - 0 - 0 - 0 +- proto: CrateSecurityTrackingMindshieldImplants + entities: + - uid: 13664 + components: + - type: Transform + pos: -36.5,20.5 + parent: 4812 - proto: CrateTrashCart entities: - uid: 6171 @@ -34457,10 +34491,10 @@ entities: parent: 4812 - proto: DefaultStationBeaconArmory entities: - - uid: 9626 + - uid: 12216 components: - type: Transform - pos: -34.5,20.5 + pos: -36.5,21.5 parent: 4812 - proto: DefaultStationBeaconArrivals entities: @@ -34819,10 +34853,10 @@ entities: parent: 4812 - proto: DefaultStationBeaconTEG entities: - - uid: 13631 + - uid: 10970 components: - type: Transform - pos: -54.5,3.5 + pos: -52.5,3.5 parent: 4812 - proto: DefaultStationBeaconTheater entities: @@ -37710,10 +37744,10 @@ entities: - type: Transform pos: -26.5,-25.5 parent: 4812 - - uid: 8339 + - uid: 8333 components: - type: Transform - pos: -35.5,17.5 + pos: -36.5,14.5 parent: 4812 - proto: DonkpocketBoxSpawner entities: @@ -38011,7 +38045,7 @@ entities: - uid: 8436 components: - type: Transform - pos: -36.520676,15.807589 + pos: -36.014038,16.6179 parent: 4812 - proto: DrinkVodkaBottleFull entities: @@ -38464,6 +38498,13 @@ entities: parent: 4812 - type: FaxMachine name: Library + - uid: 13221 + components: + - type: Transform + pos: -29.5,10.5 + parent: 4812 + - type: FaxMachine + name: Security - proto: FaxMachineCaptain entities: - uid: 7298 @@ -38684,24 +38725,17 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: -32.5,16.5 + pos: -32.5,17.5 parent: 4812 - type: DeviceList devices: - 12211 - - 12212 - 7782 - 7783 - - uid: 12217 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -37.5,16.5 - parent: 4812 - - type: DeviceList - devices: - - 12216 - 12212 + - 7743 + - 13696 + - 13697 - uid: 12221 components: - type: Transform @@ -39076,6 +39110,27 @@ entities: - 5600 - 5599 - 12355 + - uid: 13155 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -38.5,16.5 + parent: 4812 + - type: DeviceList + devices: + - 12212 + - 5174 + - uid: 13681 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,0.5 + parent: 4812 + - type: DeviceList + devices: + - 13683 + - 13682 + - 9504 - proto: FireAxeCabinetFilled entities: - uid: 13381 @@ -39280,6 +39335,15 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-10.5 parent: 4812 + - uid: 7743 + components: + - type: Transform + pos: -31.5,10.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 12210 + - 12209 - uid: 8591 components: - type: Transform @@ -39366,6 +39430,45 @@ entities: rot: 3.141592653589793 rad pos: -9.5,-24.5 parent: 4812 + - uid: 13682 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,6.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13607 + - 13681 + - uid: 13683 + components: + - type: Transform + pos: -48.5,0.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13607 + - 13681 + - uid: 13696 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,20.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 12210 + - 12209 + - uid: 13697 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,20.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 12210 + - 12209 - proto: FirelockElectronics entities: - uid: 10718 @@ -39797,11 +39900,17 @@ entities: - type: Transform pos: -26.5,12.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 12210 - uid: 7783 components: - type: Transform pos: -25.5,12.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 12210 - uid: 7784 components: - type: Transform @@ -39927,6 +40036,11 @@ entities: - type: Transform pos: -32.5,15.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13155 + - 13156 + - 12210 - uid: 13228 components: - type: Transform @@ -40837,6 +40951,8 @@ entities: - type: Transform pos: -47.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - proto: GasMixerFlipped entities: - uid: 9515 @@ -40856,6 +40972,8 @@ entities: rot: 1.5707963267948966 rad pos: -57.5,1.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - proto: GasOutletInjector entities: - uid: 4002 @@ -40908,6 +41026,8 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,1.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - proto: GasPassiveGate entities: - uid: 5801 @@ -40999,6 +41119,8 @@ entities: - type: Transform pos: -57.5,7.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 9901 components: - type: Transform @@ -41010,11 +41132,15 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,2.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 12775 components: - type: Transform pos: -58.5,9.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - proto: GasPipeBend entities: - uid: 560 @@ -41513,6 +41639,8 @@ entities: rot: -1.5707963267948966 rad pos: -50.5,-1.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 9220 components: - type: Transform @@ -41526,6 +41654,8 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-1.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 9354 components: - type: Transform @@ -41547,6 +41677,8 @@ entities: rot: 3.141592653589793 rad pos: -58.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 9718 components: - type: Transform @@ -41584,6 +41716,8 @@ entities: rot: 3.141592653589793 rad pos: -57.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 11972 components: - type: Transform @@ -41641,33 +41775,45 @@ entities: rot: -1.5707963267948966 rad pos: -57.5,2.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13462 components: - type: Transform pos: -56.5,1.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13483 components: - type: Transform rot: 3.141592653589793 rad pos: -48.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13507 components: - type: Transform pos: -54.5,1.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13508 components: - type: Transform rot: 1.5707963267948966 rad pos: -55.5,2.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13539 components: - type: Transform pos: -51.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - proto: GasPipeFourway entities: - uid: 402 @@ -49109,6 +49255,13 @@ entities: parent: 4812 - type: AtmosPipeColor color: '#990000FF' + - uid: 7761 + components: + - type: Transform + pos: -35.5,19.5 + parent: 4812 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 7797 components: - type: Transform @@ -49646,6 +49799,22 @@ entities: parent: 4812 - type: AtmosPipeColor color: '#990000FF' + - uid: 8058 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,16.5 + parent: 4812 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 8059 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,17.5 + parent: 4812 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 8225 components: - type: Transform @@ -49850,6 +50019,8 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,2.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 8728 components: - type: Transform @@ -50514,6 +50685,8 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 9226 components: - type: Transform @@ -50629,6 +50802,8 @@ entities: - type: Transform pos: -55.5,-0.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 9269 components: - type: Transform @@ -50691,6 +50866,8 @@ entities: - type: Transform pos: -57.5,6.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 9350 components: - type: Transform @@ -50782,6 +50959,8 @@ entities: rot: -1.5707963267948966 rad pos: -58.5,1.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 10777 components: - type: Transform @@ -50794,6 +50973,13 @@ entities: parent: 4812 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 10975 + components: + - type: Transform + pos: -35.5,20.5 + parent: 4812 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 11707 components: - type: Transform @@ -50808,6 +50994,8 @@ entities: rot: 1.5707963267948966 rad pos: -58.5,2.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 11963 components: - type: Transform @@ -51275,6 +51463,8 @@ entities: rot: 1.5707963267948966 rad pos: -54.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 12793 components: - type: Transform @@ -51745,6 +51935,8 @@ entities: rot: 3.141592653589793 rad pos: -50.5,0.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13431 components: - type: Transform @@ -51757,63 +51949,85 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13442 components: - type: Transform rot: -1.5707963267948966 rad pos: -50.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13444 components: - type: Transform rot: -1.5707963267948966 rad pos: -48.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13450 components: - type: Transform rot: 3.141592653589793 rad pos: -50.5,-0.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13504 components: - type: Transform rot: 3.141592653589793 rad pos: -58.5,6.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13525 components: - type: Transform pos: -50.5,3.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13527 components: - type: Transform pos: -50.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13530 components: - type: Transform rot: 3.141592653589793 rad pos: -58.5,7.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13531 components: - type: Transform rot: 3.141592653589793 rad pos: -58.5,8.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13533 components: - type: Transform pos: -55.5,0.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13549 components: - type: Transform rot: -1.5707963267948966 rad pos: -52.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - proto: GasPipeTJunction entities: - uid: 373 @@ -53311,6 +53525,14 @@ entities: parent: 4812 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8338 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,15.5 + parent: 4812 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 8757 components: - type: Transform @@ -53381,17 +53603,23 @@ entities: - type: Transform pos: -55.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 9320 components: - type: Transform rot: 3.141592653589793 rad pos: -55.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 9528 components: - type: Transform pos: -57.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 9869 components: - type: Transform @@ -53422,6 +53650,14 @@ entities: parent: 4812 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 10927 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,18.5 + parent: 4812 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 11982 components: - type: Transform @@ -53483,6 +53719,8 @@ entities: rot: -1.5707963267948966 rad pos: -50.5,2.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 12858 components: - type: Transform @@ -53527,18 +53765,24 @@ entities: rot: 3.141592653589793 rad pos: -51.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13445 components: - type: Transform rot: -1.5707963267948966 rad pos: -47.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13502 components: - type: Transform rot: 1.5707963267948966 rad pos: -55.5,1.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - proto: GasPort entities: - uid: 3467 @@ -53621,6 +53865,8 @@ entities: - type: Transform pos: -48.5,6.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13528 components: - type: Transform @@ -53638,6 +53884,8 @@ entities: rot: 3.141592653589793 rad pos: -56.5,0.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - proto: GasPressurePump entities: - uid: 3406 @@ -53712,6 +53960,8 @@ entities: - type: Transform pos: -58.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 11900 components: - type: Transform @@ -53742,17 +53992,23 @@ entities: rot: -1.5707963267948966 rad pos: -49.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13434 components: - type: Transform rot: 3.141592653589793 rad pos: -57.5,3.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13516 components: - type: Transform pos: -50.5,5.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - proto: GasThermoMachineFreezer entities: - uid: 859 @@ -53777,6 +54033,8 @@ entities: rot: 3.141592653589793 rad pos: -54.5,0.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13674 components: - type: Transform @@ -53797,6 +54055,8 @@ entities: rot: 3.141592653589793 rad pos: -47.5,3.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13494 components: - type: Transform @@ -53833,6 +54093,8 @@ entities: parent: 4812 - type: GasValve open: False + - type: AtmosPipeColor + color: '#947507FF' - uid: 9924 components: - type: Transform @@ -54522,13 +54784,6 @@ entities: parent: 4812 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 7906 - components: - - type: Transform - pos: -35.5,15.5 - parent: 4812 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 7910 components: - type: Transform @@ -54592,6 +54847,17 @@ entities: parent: 4812 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8372 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,18.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13677 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 8562 components: - type: Transform @@ -54636,6 +54902,16 @@ entities: - 13607 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 10972 + components: + - type: Transform + pos: -35.5,21.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13677 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 11962 components: - type: Transform @@ -54776,6 +55052,17 @@ entities: - 13607 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 13522 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,15.5 + parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13156 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 711 @@ -55350,6 +55637,9 @@ entities: - type: Transform pos: -34.5,15.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 13156 - type: AtmosPipeColor color: '#990000FF' - uid: 7909 @@ -55614,30 +55904,40 @@ entities: rot: 3.141592653589793 rad pos: -50.5,1.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13225 components: - type: Transform rot: -1.5707963267948966 rad pos: -54.5,2.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13369 components: - type: Transform rot: 1.5707963267948966 rad pos: -52.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - uid: 13452 components: - type: Transform rot: -1.5707963267948966 rad pos: -52.5,2.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13474 components: - type: Transform rot: 1.5707963267948966 rad pos: -54.5,4.5 parent: 4812 + - type: AtmosPipeColor + color: '#947507FF' - proto: GeneratorBasic15kW entities: - uid: 1729 @@ -55647,10 +55947,10 @@ entities: parent: 4812 - proto: GeneratorRTG entities: - - uid: 2918 + - uid: 7760 components: - type: Transform - pos: -39.5,21.5 + pos: -59.5,-3.5 parent: 4812 - proto: Girder entities: @@ -56125,6 +56425,11 @@ entities: - type: Transform pos: -13.5,26.5 parent: 4812 + - uid: 2595 + components: + - type: Transform + pos: -35.5,19.5 + parent: 4812 - uid: 2607 components: - type: Transform @@ -57633,20 +57938,10 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,33.5 parent: 4812 - - uid: 8057 - components: - - type: Transform - pos: -35.5,18.5 - parent: 4812 - - uid: 8058 - components: - - type: Transform - pos: -33.5,18.5 - parent: 4812 - - uid: 8059 + - uid: 8052 components: - type: Transform - pos: -32.5,19.5 + pos: -35.5,17.5 parent: 4812 - uid: 8060 components: @@ -58219,6 +58514,11 @@ entities: - type: Transform pos: -41.5,-28.5 parent: 4812 + - uid: 9636 + components: + - type: Transform + pos: -33.5,19.5 + parent: 4812 - uid: 9649 components: - type: Transform @@ -58767,6 +59067,11 @@ entities: - type: Transform pos: -19.5,33.5 parent: 4812 + - uid: 12058 + components: + - type: Transform + pos: -33.5,17.5 + parent: 4812 - uid: 12108 components: - type: Transform @@ -59567,6 +59872,12 @@ entities: - type: Transform pos: -57.5,16.5 parent: 4812 + - uid: 13691 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,16.5 + parent: 4812 - proto: GrilleBroken entities: - uid: 1544 @@ -59848,19 +60159,33 @@ entities: - type: Transform pos: -0.5,-56.5 parent: 4812 +- proto: GunSafeLaserCarbine + entities: + - uid: 12053 + components: + - type: Transform + pos: -37.5,22.5 + parent: 4812 - proto: GunSafeRifleLecter entities: - - uid: 4809 + - uid: 12215 components: - type: Transform - pos: -36.5,19.5 + pos: -37.5,20.5 + parent: 4812 +- proto: GunSafeShotgunKammerer + entities: + - uid: 12054 + components: + - type: Transform + pos: -34.5,22.5 parent: 4812 - proto: GunSafeSubMachineGunDrozd entities: - - uid: 10442 + - uid: 8377 components: - type: Transform - pos: -33.5,19.5 + pos: -37.5,21.5 parent: 4812 - proto: Handcuffs entities: @@ -59953,30 +60278,38 @@ entities: parent: 4812 - proto: HeatExchanger entities: - - uid: 2965 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -52.5,-1.5 - parent: 4812 - uid: 4581 components: - type: Transform rot: 1.5707963267948966 rad pos: -54.5,-1.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 9291 components: - type: Transform rot: 1.5707963267948966 rad pos: -53.5,-1.5 parent: 4812 - - uid: 13221 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 9568 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,-1.5 + parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 9569 components: - type: Transform rot: 1.5707963267948966 rad pos: -51.5,-1.5 parent: 4812 + - type: AtmosPipeColor + color: '#03FCD3FF' - proto: Hemostat entities: - uid: 6244 @@ -60224,24 +60557,24 @@ entities: - uid: 9679 components: - type: Transform - pos: -30.41609,4.5644865 + pos: -31.44901,3.4804118 parent: 4812 - uid: 9680 components: - type: Transform - pos: -30.41609,4.5644865 + pos: -31.407343,3.438716 parent: 4812 - proto: InflatableWallStack entities: - uid: 9677 components: - type: Transform - pos: -30.681715,4.7676115 + pos: -31.66776,3.7514334 parent: 4812 - uid: 9678 components: - type: Transform - pos: -30.681715,4.7676115 + pos: -31.60526,3.6784658 parent: 4812 - proto: IngotGold entities: @@ -60461,6 +60794,13 @@ entities: - type: Transform pos: 9.516455,14.564514 parent: 4812 +- proto: JetpackSecurityFilled + entities: + - uid: 13680 + components: + - type: Transform + pos: -33.539055,21.668404 + parent: 4812 - proto: KitchenKnife entities: - uid: 1642 @@ -60869,10 +61209,10 @@ entities: parent: 4812 - proto: LockerAtmosphericsFilled entities: - - uid: 9570 + - uid: 9571 components: - type: Transform - pos: -29.5,5.5 + pos: -28.5,5.5 parent: 4812 - type: EntityStorage air: @@ -60892,29 +61232,11 @@ entities: - 0 - 0 - 0 - - uid: 9571 + - uid: 10969 components: - type: Transform - pos: -28.5,5.5 + pos: -28.5,4.5 parent: 4812 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.6033952 - - 6.031821 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: LockerBoozeFilled entities: - uid: 1648 @@ -61236,29 +61558,11 @@ entities: - type: Transform pos: -28.5,24.5 parent: 4812 - - uid: 8359 + - uid: 10926 components: - type: Transform - pos: -31.5,18.5 + pos: -31.5,19.5 parent: 4812 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.6033952 - - 6.031821 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: LockerFreezer entities: - uid: 1538 @@ -61661,29 +61965,11 @@ entities: parent: 4812 - proto: LockerWardenFilled entities: - - uid: 8337 + - uid: 12520 components: - type: Transform - pos: -36.5,14.5 + pos: -37.5,14.5 parent: 4812 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.6033952 - - 6.031821 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: LockerWeldingSuppliesFilled entities: - uid: 11898 @@ -62716,12 +63002,12 @@ entities: - uid: 9675 components: - type: Transform - pos: -30.275465,5.5801115 + pos: -32.292763,3.542955 parent: 4812 - uid: 9676 components: - type: Transform - pos: -30.275465,5.5801115 + pos: -32.21984,3.4804118 parent: 4812 - uid: 11950 components: @@ -62969,10 +63255,10 @@ entities: parent: 4812 - proto: PortableFlasher entities: - - uid: 12520 + - uid: 11923 components: - type: Transform - pos: -36.5,20.5 + pos: -33.5,20.5 parent: 4812 - proto: PortableGeneratorJrPacman entities: @@ -63355,13 +63641,6 @@ entities: - type: Transform pos: -27.5,-5.5 parent: 4812 -- proto: PosterLegitSafetyMothMeth - entities: - - uid: 13664 - components: - - type: Transform - pos: -13.5,-18.5 - parent: 4812 - proto: PosterLegitScience entities: - uid: 6367 @@ -63811,12 +64090,6 @@ entities: parent: 4812 - proto: Poweredlight entities: - - uid: 732 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -36.5,5.5 - parent: 4812 - uid: 742 components: - type: Transform @@ -64697,22 +64970,6 @@ entities: parent: 4812 - type: ApcPowerReceiver powerLoad: 0 - - uid: 8142 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -31.5,16.5 - parent: 4812 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 8143 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,16.5 - parent: 4812 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 8144 components: - type: Transform @@ -64721,14 +64978,6 @@ entities: parent: 4812 - type: ApcPowerReceiver powerLoad: 0 - - uid: 8145 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -36.5,19.5 - parent: 4812 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 8247 components: - type: Transform @@ -64766,6 +65015,11 @@ entities: parent: 4812 - type: ApcPowerReceiver powerLoad: 0 + - uid: 8359 + components: + - type: Transform + pos: -35.5,22.5 + parent: 4812 - uid: 8603 components: - type: Transform @@ -64866,14 +65120,17 @@ entities: parent: 4812 - type: ApcPowerReceiver powerLoad: 0 - - uid: 9823 + - uid: 9972 components: - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,1.5 + rot: 1.5707963267948966 rad + pos: -54.5,12.5 + parent: 4812 + - uid: 10442 + components: + - type: Transform + pos: -32.5,5.5 parent: 4812 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 10660 components: - type: Transform @@ -65059,13 +65316,6 @@ entities: parent: 4812 - type: ApcPowerReceiver powerLoad: 0 - - uid: 11923 - components: - - type: Transform - pos: -30.5,5.5 - parent: 4812 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 11924 components: - type: Transform @@ -65168,6 +65418,24 @@ entities: - type: Transform pos: -52.5,6.5 parent: 4812 + - uid: 13678 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -36.5,18.5 + parent: 4812 + - uid: 13679 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -37.5,15.5 + parent: 4812 + - uid: 13698 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -31.5,17.5 + parent: 4812 - proto: PoweredlightEmpty entities: - uid: 11249 @@ -65827,6 +66095,12 @@ entities: parent: 4812 - type: ApcPowerReceiver powerLoad: 0 + - uid: 10602 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,1.5 + parent: 4812 - uid: 10696 components: - type: Transform @@ -66026,11 +66300,6 @@ entities: - type: Transform pos: 3.5,14.5 parent: 4812 - - uid: 2595 - components: - - type: Transform - pos: -36.5,17.5 - parent: 4812 - uid: 2699 components: - type: Transform @@ -66126,11 +66395,6 @@ entities: - type: Transform pos: -16.5,16.5 parent: 4812 - - uid: 8377 - components: - - type: Transform - pos: -35.5,19.5 - parent: 4812 - uid: 8424 components: - type: Transform @@ -66253,7 +66517,7 @@ entities: - uid: 8453 components: - type: Transform - pos: -29.452932,10.599279 + pos: -30.22465,10.760374 parent: 4812 - proto: Railing entities: @@ -66286,6 +66550,18 @@ entities: rot: 3.141592653589793 rad pos: -32.5,3.5 parent: 4812 + - uid: 10983 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,5.5 + parent: 4812 + - uid: 11014 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,4.5 + parent: 4812 - uid: 12877 components: - type: Transform @@ -66889,25 +67165,16 @@ entities: parent: 4812 - proto: ReinforcedPlasmaWindow entities: - - uid: 4138 - components: - - type: Transform - pos: -35.5,18.5 - parent: 4812 - - uid: 4139 - components: - - type: Transform - pos: -33.5,18.5 - parent: 4812 - - uid: 4140 + - uid: 4141 components: - type: Transform - pos: -32.5,19.5 + pos: -32.5,20.5 parent: 4812 - - uid: 4141 + - uid: 8371 components: - type: Transform - pos: -32.5,20.5 + rot: 3.141592653589793 rad + pos: -33.5,19.5 parent: 4812 - uid: 9119 components: @@ -67012,6 +67279,12 @@ entities: rot: -1.5707963267948966 rad pos: -58.5,1.5 parent: 4812 + - uid: 10973 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,19.5 + parent: 4812 - uid: 11887 components: - type: Transform @@ -68673,6 +68946,17 @@ entities: rot: 3.141592653589793 rad pos: -44.5,13.5 parent: 4812 + - uid: 8051 + components: + - type: Transform + pos: -33.5,17.5 + parent: 4812 + - uid: 8142 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -32.5,16.5 + parent: 4812 - uid: 8169 components: - type: Transform @@ -68988,6 +69272,11 @@ entities: rot: 1.5707963267948966 rad pos: -37.5,4.5 parent: 4812 + - uid: 10928 + components: + - type: Transform + pos: -35.5,17.5 + parent: 4812 - uid: 11047 components: - type: Transform @@ -69432,6 +69721,20 @@ entities: - type: Transform pos: -14.491153,4.5839243 parent: 4812 +- proto: RiotBulletShield + entities: + - uid: 7803 + components: + - type: Transform + pos: -33.720795,21.923859 + parent: 4812 +- proto: RiotLaserShield + entities: + - uid: 7935 + components: + - type: Transform + pos: -33.356216,21.923859 + parent: 4812 - proto: RobocopCircuitBoard entities: - uid: 12651 @@ -69586,16 +69889,11 @@ entities: parent: 4812 - proto: SecurityTechFab entities: - - uid: 8371 + - uid: 10945 components: - type: Transform - pos: -34.5,21.5 + pos: -35.5,20.5 parent: 4812 - - type: MaterialStorage - materialWhiteList: - - Glass - - Plastic - - Steel - proto: SeedExtractor entities: - uid: 1086 @@ -69786,12 +70084,12 @@ entities: - uid: 9673 components: - type: Transform - pos: -30.650465,5.5347195 + pos: -32.71984,3.6993136 parent: 4812 - uid: 9674 components: - type: Transform - pos: -30.650465,5.5347195 + pos: -32.636513,3.6576178 parent: 4812 - uid: 9725 components: @@ -70341,10 +70639,10 @@ entities: parent: 4812 - proto: SignArmory entities: - - uid: 7803 + - uid: 745 components: - type: Transform - pos: -36.5,18.5 + pos: -36.5,19.5 parent: 4812 - proto: SignAtmos entities: @@ -70716,6 +71014,12 @@ entities: - type: Transform pos: -38.5,-9.5 parent: 4812 + - uid: 13690 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,18.5 + parent: 4812 - proto: SignEngine entities: - uid: 10775 @@ -70887,6 +71191,12 @@ entities: - type: Transform pos: -46.5,1.5 parent: 4812 + - uid: 13692 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,23.5 + parent: 4812 - proto: SignPlaque entities: - uid: 7570 @@ -71052,6 +71362,12 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-45.5 parent: 4812 + - uid: 13685 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,19.5 + parent: 4812 - proto: SignSecureSmall entities: - uid: 2931 @@ -71114,6 +71430,12 @@ entities: - type: Transform pos: -33.5,-38.5 parent: 4812 + - uid: 9971 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-18.5 + parent: 4812 - uid: 10751 components: - type: Transform @@ -71964,10 +72286,10 @@ entities: parent: 4812 - proto: SpawnMobMcGriff entities: - - uid: 8340 + - uid: 12632 components: - type: Transform - pos: -35.5,17.5 + pos: -36.5,14.5 parent: 4812 - proto: SpawnMobMonkeyPunpun entities: @@ -72032,15 +72354,15 @@ entities: parent: 4812 - proto: SpawnPointAtmos entities: - - uid: 13155 + - uid: 9570 components: - type: Transform - pos: -28.5,4.5 + pos: -29.5,5.5 parent: 4812 - - uid: 13156 + - uid: 13684 components: - type: Transform - pos: -29.5,3.5 + pos: -29.5,4.5 parent: 4812 - proto: SpawnPointBartender entities: @@ -72749,6 +73071,18 @@ entities: - type: Transform pos: 30.5,-39.5 parent: 4812 +- proto: SuitStorageAtmos + entities: + - uid: 13688 + components: + - type: Transform + pos: -30.5,4.5 + parent: 4812 + - uid: 13689 + components: + - type: Transform + pos: -30.5,5.5 + parent: 4812 - proto: SuitStorageCaptain entities: - uid: 746 @@ -72828,17 +73162,29 @@ entities: - type: Transform pos: 27.5,-17.5 parent: 4812 -- proto: SuitStorageWarden +- proto: SuitStorageSec entities: - - uid: 745 + - uid: 8043 components: - type: Transform - pos: -36.5,21.5 + pos: -36.5,18.5 parent: 4812 - - uid: 12663 + - uid: 8045 components: - type: Transform - pos: -35.5,21.5 + pos: -35.5,22.5 + parent: 4812 + - uid: 12217 + components: + - type: Transform + pos: -36.5,22.5 + parent: 4812 +- proto: SuitStorageWarden + entities: + - uid: 10967 + components: + - type: Transform + pos: -37.5,15.5 parent: 4812 - proto: SurveillanceCameraCommand entities: @@ -73706,10 +74052,10 @@ entities: parent: 4812 - proto: SurveillanceCameraRouterSecurity entities: - - uid: 8372 + - uid: 9990 components: - type: Transform - pos: -33.5,21.5 + pos: -37.5,16.5 parent: 4812 - proto: SurveillanceCameraRouterService entities: @@ -73804,16 +74150,13 @@ entities: id: Anomaly Generator - proto: SurveillanceCameraSecurity entities: - - uid: 12058 + - uid: 10974 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -36.5,20.5 + rot: 3.141592653589793 rad + pos: -35.5,22.5 parent: 4812 - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraSecurity - nameSet: True id: Armory - uid: 12059 components: @@ -75125,11 +75468,6 @@ entities: - type: Transform pos: -32.5,15.5 parent: 4812 - - uid: 8333 - components: - - type: Transform - pos: -36.5,15.5 - parent: 4812 - uid: 8334 components: - type: Transform @@ -75242,16 +75580,6 @@ entities: rot: 3.141592653589793 rad pos: -9.5,-24.5 parent: 4812 - - uid: 9568 - components: - - type: Transform - pos: -30.5,4.5 - parent: 4812 - - uid: 9569 - components: - - type: Transform - pos: -30.5,5.5 - parent: 4812 - uid: 9724 components: - type: Transform @@ -75272,6 +75600,12 @@ entities: - type: Transform pos: -32.5,-7.5 parent: 4812 + - uid: 9823 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,21.5 + parent: 4812 - uid: 10633 components: - type: Transform @@ -75297,6 +75631,11 @@ entities: - type: Transform pos: -27.5,-0.5 parent: 4812 + - uid: 10977 + components: + - type: Transform + pos: -35.5,16.5 + parent: 4812 - uid: 11144 components: - type: Transform @@ -75337,10 +75676,10 @@ entities: - type: Transform pos: -10.5,17.5 parent: 4812 - - uid: 12054 + - uid: 12055 components: - type: Transform - pos: -33.5,20.5 + pos: -33.5,22.5 parent: 4812 - uid: 12673 components: @@ -75348,6 +75687,18 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,14.5 parent: 4812 + - uid: 13686 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,3.5 + parent: 4812 + - uid: 13687 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,3.5 + parent: 4812 - proto: TableReinforcedGlass entities: - uid: 6303 @@ -78620,6 +78971,16 @@ entities: - type: Transform pos: 16.5,-6.5 parent: 4812 + - uid: 4139 + components: + - type: Transform + pos: -38.5,16.5 + parent: 4812 + - uid: 4140 + components: + - type: Transform + pos: -38.5,15.5 + parent: 4812 - uid: 4178 components: - type: Transform @@ -78777,6 +79138,11 @@ entities: - type: Transform pos: -9.5,-31.5 parent: 4812 + - uid: 4809 + components: + - type: Transform + pos: -38.5,14.5 + parent: 4812 - uid: 4828 components: - type: Transform @@ -79380,7 +79746,7 @@ entities: - uid: 5595 components: - type: Transform - pos: -38.5,18.5 + pos: -38.5,17.5 parent: 4812 - uid: 5769 components: @@ -80088,52 +80454,42 @@ entities: - uid: 7732 components: - type: Transform - pos: -32.5,18.5 + pos: -39.5,24.5 parent: 4812 - uid: 7733 components: - type: Transform - pos: -33.5,22.5 + pos: -38.5,24.5 parent: 4812 - uid: 7734 components: - type: Transform - pos: -34.5,22.5 + pos: -37.5,24.5 parent: 4812 - uid: 7735 components: - type: Transform - pos: -35.5,22.5 + pos: -38.5,18.5 parent: 4812 - uid: 7736 components: - type: Transform - pos: -36.5,22.5 + pos: -39.5,22.5 parent: 4812 - uid: 7737 components: - type: Transform - pos: -37.5,18.5 + pos: -39.5,20.5 parent: 4812 - uid: 7738 components: - type: Transform - pos: -37.5,19.5 - parent: 4812 - - uid: 7739 - components: - - type: Transform - pos: -37.5,20.5 + pos: -39.5,19.5 parent: 4812 - uid: 7740 components: - type: Transform - pos: -36.5,18.5 - parent: 4812 - - uid: 7743 - components: - - type: Transform - pos: -32.5,16.5 + pos: -33.5,24.5 parent: 4812 - uid: 7744 components: @@ -80173,32 +80529,22 @@ entities: - uid: 7756 components: - type: Transform - pos: -37.5,21.5 + pos: -34.5,24.5 parent: 4812 - uid: 7757 components: - type: Transform - pos: -37.5,22.5 + pos: -36.5,24.5 parent: 4812 - uid: 7758 components: - type: Transform - pos: -37.5,17.5 + pos: -39.5,21.5 parent: 4812 - uid: 7759 components: - type: Transform - pos: -37.5,16.5 - parent: 4812 - - uid: 7760 - components: - - type: Transform - pos: -37.5,15.5 - parent: 4812 - - uid: 7761 - components: - - type: Transform - pos: -37.5,14.5 + pos: -35.5,24.5 parent: 4812 - uid: 7762 components: @@ -80345,11 +80691,32 @@ entities: - type: Transform pos: -35.5,8.5 parent: 4812 + - uid: 8048 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,19.5 + parent: 4812 + - uid: 8055 + components: + - type: Transform + pos: -32.5,17.5 + parent: 4812 - uid: 8267 components: - type: Transform pos: -35.5,3.5 parent: 4812 + - uid: 8339 + components: + - type: Transform + pos: -39.5,23.5 + parent: 4812 + - uid: 8340 + components: + - type: Transform + pos: -36.5,17.5 + parent: 4812 - uid: 8358 components: - type: Transform @@ -81662,6 +82029,11 @@ entities: - type: Transform pos: -46.5,-19.5 parent: 4812 + - uid: 9992 + components: + - type: Transform + pos: -37.5,19.5 + parent: 4812 - uid: 10414 components: - type: Transform @@ -81718,6 +82090,16 @@ entities: rot: -1.5707963267948966 rad pos: -62.5,3.5 parent: 4812 + - uid: 10929 + components: + - type: Transform + pos: -36.5,19.5 + parent: 4812 + - uid: 10963 + components: + - type: Transform + pos: -37.5,17.5 + parent: 4812 - uid: 10964 components: - type: Transform @@ -82084,6 +82466,11 @@ entities: rot: -1.5707963267948966 rad pos: -55.5,12.5 parent: 4812 + - uid: 12429 + components: + - type: Transform + pos: -37.5,18.5 + parent: 4812 - uid: 12582 components: - type: Transform @@ -85897,51 +86284,13 @@ entities: - uid: 3754 components: - type: Transform - pos: -33.40336,20.459352 + pos: -35.564545,16.749907 parent: 4812 - uid: 3759 components: - type: Transform - pos: -33.40336,20.459352 - parent: 4812 -- proto: WeaponLaserCarbine - entities: - - uid: 12470 - components: - - type: Transform - pos: -33.4461,20.270079 - parent: 4812 - - uid: 12471 - components: - - type: Transform - pos: -33.4461,20.218811 + pos: -35.46038,16.551853 parent: 4812 - - uid: 12631 - components: - - type: Transform - pos: -33.43493,20.166264 - parent: 4812 - - uid: 12632 - components: - - type: Transform - pos: -33.388054,20.103764 - parent: 4812 -- proto: WeaponShotgunKammerer - entities: - - uid: 12052 - components: - - type: Transform - pos: -35.535385,19.569157 - parent: 4812 - - type: BallisticAmmoProvider - unspawnedCount: 4 - - uid: 12053 - components: - - type: Transform - pos: -35.410385,19.412907 - parent: 4812 - - type: BallisticAmmoProvider - unspawnedCount: 4 - proto: WeaponSubMachineGunWt550 entities: - uid: 13165 @@ -86204,6 +86553,12 @@ entities: rot: 3.141592653589793 rad pos: 28.5,13.5 parent: 4812 + - uid: 13169 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,15.5 + parent: 4812 - proto: WindoorSecureChemistryLocked entities: - uid: 6582 @@ -86289,12 +86644,6 @@ entities: parent: 4812 - proto: WindoorSecureSalvageLocked entities: - - uid: 13169 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 21.5,15.5 - parent: 4812 - uid: 13253 components: - type: Transform @@ -86362,6 +86711,12 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,19.5 parent: 4812 + - uid: 8332 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,18.5 + parent: 4812 - proto: WindoorTheatreLocked entities: - uid: 896 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 31ebad618370..2ca2b0f74046 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -17,6 +17,7 @@ - id: RubberStampApproved - id: RubberStampDenied - id: RubberStampQm + - id: AstroNavCartridge - type: entity id: LockerQuarterMasterFilled diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index efa288a44b89..c84e88d0771b 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -993,11 +993,47 @@ categories: - UplinkDisruption conditions: - - !type:BuyerWhitelistCondition + - !type:BuyerWhitelistCondition blacklist: components: - SurplusBundle +- type: listing + id: UplinkAntimovCircuitBoard + name: uplink-antimov-law-name + description: uplink-antimov-law-desc + productEntity: AntimovCircuitBoard + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 10 + cost: + Telecrystal: 14 + categories: + - UplinkDisruption + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + +- type: listing + id: UplinkNukieAntimovCircuitBoard + name: uplink-antimov-law-name + description: uplink-antimov-law-desc + productEntity: AntimovCircuitBoard + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 20 + cost: + Telecrystal: 24 + categories: + - UplinkDisruption + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - type: listing id: UplinkSurplusBundle name: uplink-surplus-bundle-name diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 857115e10f19..d5b4366e2bae 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -32,12 +32,8 @@ factions: - SimpleNeutral - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: HealthExaminable examinableTypes: @@ -396,6 +392,5 @@ - Bot - type: ActiveRadio channels: - - Binary - Common - Supply diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml new file mode 100644 index 000000000000..62a4ee72947e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/misc.yml @@ -0,0 +1,15 @@ +- type: entity + parent: BaseElectronics + id: FreezerElectronics + name: freezer electronics + description: An electronics board used in kitchen freezers. + components: + - type: Sprite + sprite: Objects/Misc/module.rsi + state: door_electronics + - type: Tag + tags: + - FreezerElectronics + - type: DoorElectronics + - type: StaticPrice + price: 55 diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml index 91493f48cd1f..aee26b077698 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml @@ -116,3 +116,22 @@ - type: WantedListCartridge - type: StealTarget stealGroup: WantedListCartridge + +- type: entity + parent: BaseItem + id: AstroNavCartridge + name: AstroNav cartridge + description: A program for navigation that provides GPS coordinates. + components: + - type: Sprite + sprite: Objects/Devices/cartridge.rsi + state: cart-nav + - type: Icon + sprite: Objects/Devices/cartridge.rsi + state: cart-nav + - type: Cartridge + programName: astro-nav-program-name + icon: + sprite: Objects/Devices/gps.rsi + state: icon + - type: AstroNavCartridge diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 48e7a28debeb..c6952fdd6aa2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -115,11 +115,11 @@ speechVerb: Robotic - type: entity + parent: BasePDA id: BaseSecurityPDA abstract: true components: - type: CartridgeLoader - uiKey: enum.PdaUiKey.Key preinstalled: - CrewManifestCartridge - NotekeeperCartridge @@ -184,7 +184,7 @@ - Medical Doctor - type: entity - parent: BasePDA + parent: BaseSecurityPDA id: SecurityCadetPDA name: security cadet PDA description: Why isn't it red? @@ -400,6 +400,13 @@ accentVColor: "#8900c9" - type: Icon state: pda-miner + - type: CartridgeLoader + uiKey: enum.PdaUiKey.Key + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - AstroNavCartridge - type: entity parent: BasePDA @@ -445,7 +452,7 @@ state: pda-library - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: LawyerPDA name: lawyer PDA description: For lawyers to poach dubious clients. @@ -488,7 +495,7 @@ state: pda-janitor - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: CaptainPDA name: captain PDA description: Surprisingly no different from your PDA. @@ -663,7 +670,7 @@ state: pda-science - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: HoSPDA name: head of security PDA description: Whosoever bears this PDA is the law. @@ -678,7 +685,7 @@ state: pda-hos - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: WardenPDA name: warden PDA description: The OS appears to have been jailbroken. @@ -693,7 +700,7 @@ state: pda-warden - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: SecurityPDA name: security PDA description: Red to hide the stains of passenger blood. @@ -707,7 +714,7 @@ state: pda-security - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: CentcomPDA name: CentComm PDA description: Light green sign of walking bureaucracy. @@ -847,7 +854,7 @@ - Cartridge - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: ERTLeaderPDA name: ERT Leader PDA suffix: Leader @@ -995,7 +1002,7 @@ state: pda-boxer - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: DetectivePDA name: detective PDA description: Smells like rain... pouring down the rooftops... @@ -1095,7 +1102,7 @@ state: pda-seniorphysician - type: entity - parent: [BaseSecurityPDA, BasePDA] + parent: BaseSecurityPDA id: SeniorOfficerPDA name: senior officer PDA description: Beaten, battered and broken, but just barely useable. diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 4695f1c125d2..ff662c2186aa 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -44,12 +44,8 @@ stopSearchVerbPopup: pai-system-stopped-searching - type: Examiner - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: DoAfter - type: Actions diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index d26bdf25c7c0..5c3cd4449625 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -28,16 +28,13 @@ - type: Tag tags: - Document - - Trash - Paper - type: Appearance - type: FaxableObject - type: PaperVisuals - type: Flammable fireSpread: true - canResistFire: false alwaysCombustible: true - canExtinguish: false # Mwahaha! Let the world burn because of one piece of paper! damage: types: Heat: 1 @@ -81,6 +78,11 @@ id: PaperScrap description: 'A crumpled up piece of white paper.' components: + - type: Tag + tags: + - Document + - Trash + - Paper - type: Sprite layers: - state: scrap @@ -178,6 +180,11 @@ visible: false - type: PaperLabelType paperType: Invoice + - type: Tag + tags: + - Document + - Trash + - Paper - type: PaperVisuals backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png" @@ -207,6 +214,11 @@ visible: false - type: PaperLabelType paperType: Bounty + - type: Tag + tags: + - Document + - Trash + - Paper - type: PaperVisuals backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png" diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index d985560ac2da..41d167352f29 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -514,3 +514,6 @@ - type: Tag tags: - RollingPin + - type: Construction + graph: WoodenRollingPin + node: rollingpin diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 614572ca5c89..eb89c869b869 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -199,6 +199,7 @@ - WetFloorSign - ClothingHeadHatCone - BoxFolderClipboard # Harmony + - FreezerElectronics - Flare - type: EmagLatheRecipes diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 99879cfbc945..e047614ac246 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -79,12 +79,8 @@ speechVerb: Robotic speechSounds: Vending - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - channels: - - Binary - type: ActiveRadio channels: - - Binary - Common - type: DoAfter - type: Electrified diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 89dc4d475524..244ccf2e30c4 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -170,6 +170,11 @@ - type: ExplosionResistance damageCoefficient: 0.50 - type: AntiRottingContainer + - type: Construction + graph: ClosetFreezer + node: done + containers: + - entity_storage - type: entity id: LockerFreezer diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 4c540d7b77f2..3ed0ee534895 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -42,6 +42,11 @@ - type: AntiRottingContainer - type: ExplosionResistance damageCoefficient: 0.50 + - type: Construction + graph: CrateFreezer + node: done + containers: + - entity_storage - type: entity parent: CratePlastic diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 1aa03bf4c936..602d6296b3d3 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -875,8 +875,6 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.05 - Medicine: - effects: - !type:HealthChange damage: groups: diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml new file mode 100644 index 000000000000..caa9ebbea91a --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rolling_pin.yml @@ -0,0 +1,15 @@ +- type: constructionGraph + id: WoodenRollingPin + start: start + graph: + - node: start + edges: + - to: rollingpin + steps: + - material: WoodPlank + amount: 2 + - material: MetalRod + amount: 1 + doAfter: 2 + - node: rollingpin + entity: RollingPin diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml new file mode 100644 index 000000000000..a43d84e1734e --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml @@ -0,0 +1,42 @@ +- type: constructionGraph + id: CrateFreezer + start: start + graph: + - node: start + edges: + - to: done + steps: + - material: Steel + amount: 5 + - material: Cable + amount: 2 + doAfter: 5 + - tag: FreezerElectronics + name: freezer electronics + icon: + sprite: Objects/Misc/module.rsi + state: door_electronics + - node: done + entity: CrateFreezer + edges: + - to: start + steps: + - tool: Screwing + doAfter: 5 + conditions: + - !type:StorageWelded + welded: false + - !type:Locked + locked: false + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 5 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + - !type:SpawnPrototype + prototype: FreezerElectronics + amount: 1 + - !type:EmptyAllContainers + - !type:DeleteEntity diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml index e72c56ff44c3..17696eaaff88 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml @@ -61,6 +61,49 @@ - !type:EmptyAllContainers - !type:DeleteEntity +- type: constructionGraph + id: ClosetFreezer + start: start + graph: + - node: start + edges: + - to: done + steps: + - material: Steel + amount: 4 + - material: Cable + amount: 2 + doAfter: 5 + - tag: FreezerElectronics + name: freezer electronics + icon: + sprite: Objects/Misc/module.rsi + state: door_electronics + - node: done + entity: LockerFreezerBase + edges: + - to: start + steps: + - tool: Screwing + doAfter: 5 + conditions: + - !type:StorageWelded + welded: false + - !type:Locked + locked: false + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 4 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + - !type:SpawnPrototype + prototype: FreezerElectronics + amount: 1 + - !type:EmptyAllContainers + - !type:DeleteEntity + - type: constructionGraph id: ClosetWall start: start diff --git a/Resources/Prototypes/Recipes/Crafting/crates.yml b/Resources/Prototypes/Recipes/Crafting/crates.yml index 72fabc2221b6..25450b7d9825 100644 --- a/Resources/Prototypes/Recipes/Crafting/crates.yml +++ b/Resources/Prototypes/Recipes/Crafting/crates.yml @@ -31,6 +31,17 @@ icon: { sprite: Structures/Storage/Crates/secure.rsi, state: icon } objectType: Structure +- type: construction + name: freezer + id: CrateFreezer + graph: CrateFreezer + startNode: start + targetNode: done + category: construction-category-storage + description: A metal freezing crate for storing things. + icon: { sprite: Structures/Storage/Crates/freezer.rsi, state: icon } + objectType: Structure + - type: construction name: plastic crate id: CratePlastic diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 38d254c1416d..c87f4eb3d20c 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -145,7 +145,7 @@ targetNode: shell category: construction-category-weapons objectType: Item - description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a Barn + description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn. icon: sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi state: improvised @@ -214,3 +214,16 @@ icon: sprite: Objects/Weapons/Bombs/pipebomb.rsi state: icon + +- type: construction + name: rolling pin + id: rollingpin + graph: WoodenRollingPin + startNode: start + targetNode: rollingpin + category: construction-category-tools + objectType: Item + description: A rolling pin, used for cooking and defending the kitchen. + icon: + sprite: Objects/Tools/rolling_pin.rsi + state: icon diff --git a/Resources/Prototypes/Recipes/Crafting/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/tallbox.yml index 21a7ec8225db..c90142de4454 100644 --- a/Resources/Prototypes/Recipes/Crafting/tallbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/tallbox.yml @@ -20,6 +20,17 @@ icon: { sprite: Structures/Storage/closet.rsi, state: secure_icon } objectType: Structure +- type: construction + id: ClosetFreezer + name: freezer + graph: ClosetFreezer + startNode: start + targetNode: done + category: construction-category-storage + description: A tall steel box with freezing abilities. + icon: { sprite: Structures/Storage/closet.rsi, state: freezer_icon } + objectType: Structure + - type: construction id: ClosetWall name: wall closet @@ -34,4 +45,4 @@ canRotate: true canBuildInImpassable: true conditions: - - !type:WallmountCondition \ No newline at end of file + - !type:WallmountCondition diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 818ba0fe3748..99ff9f25eef1 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -98,6 +98,11 @@ id: DoorElectronics result: DoorElectronics +- type: latheRecipe + parent: BaseCheapElectronicsRecipe + id: FreezerElectronics + result: FreezerElectronics + - type: latheRecipe parent: BaseElectronicsRecipe id: AirAlarmElectronics diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index a1955281b57b..a87fffb4830e 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -15,8 +15,6 @@ time: 10800 #3 hours - !type:OverallPlaytimeRequirement time: 10800 #3 hrs - - !type:AgeRequirement - requiredAge: 21 weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 0c7ff5188ec5..1dcccbaca379 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -6,9 +6,9 @@ requirements: - !type:DepartmentTimeRequirement department: Cargo - time: 0 # 3 hrs + time: 0 - !type:OverallPlaytimeRequirement - time: 0 #10 hrs + time: 0 icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 15de42f62d4c..9026ea9863f7 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -6,18 +6,16 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 0 # 15 hours + time: 0 # 0 hours - !type:DepartmentTimeRequirement department: Medical - time: 0 # 15 hours + time: 0 # 0 hours - !type:DepartmentTimeRequirement department: Security - time: 0 # 15 hours + time: 0 # 0 hours - !type:DepartmentTimeRequirement department: Command - time: 10800 # 15 hours - - !type:AgeRequirement - requiredAge: 21 + time: 10800 # 3 hours weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 610732a7f220..aa1b808b5b72 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,18 +6,16 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 0 # 10 hours + time: 0 # 0 hours - !type:DepartmentTimeRequirement department: Medical - time: 0 # 10 hours + time: 0 # 0 hours - !type:DepartmentTimeRequirement department: Security - time: 0 # 10 hrs + time: 0 # 0 hrs - !type:DepartmentTimeRequirement department: Command - time: 10800 # 10 hours - - !type:AgeRequirement - requiredAge: 21 + time: 10800 # 3 hours weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index e4c1c4d6fe72..efe08bd891e5 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,17 +6,15 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 0 #6 hrs + time: 0 #0 hrs - !type:RoleTimeRequirement role: JobStationEngineer - time: 0 #6 hrs + time: 0 #0hrs - !type:DepartmentTimeRequirement department: Engineering - time: 10800 #10 hrs + time: 10800 #3 hrs - !type:OverallPlaytimeRequirement - time: 10800 #40 hrs - - !type:AgeRequirement - requiredAge: 21 + time: 10800 #3 hrs weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index c5021e98c804..445e9a3fa2f3 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -8,17 +8,15 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 0 #3 hrs + time: 0 #0 hrs - !type:RoleTimeRequirement role: JobMedicalDoctor - time: 0 #6 hrs + time: 0 #0 hrs - !type:DepartmentTimeRequirement department: Medical - time: 10800 #10 hrs + time: 10800 #3 hrs - !type:OverallPlaytimeRequirement - time: 10800 #40 hrs - - !type:AgeRequirement - requiredAge: 21 + time: 10800 #3 hrs weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index afd36bd51541..3a6a2719d8e6 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,11 +6,9 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 10800 #10 hrs + time: 10800 #3 hrs - !type:OverallPlaytimeRequirement - time: 10800 #40 hrs - - !type:AgeRequirement - requiredAge: 21 + time: 10800 #3hrs weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index bc4d87726abf..73ed4f69eb8c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,17 +6,15 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 0 #3 hrs + time: 0 #0hrs - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 0 #10 hrs + time: 0 #0 hrs - !type:DepartmentTimeRequirement department: Security - time: 10800 # 30 hrs + time: 10800 # 3 hrs - !type:OverallPlaytimeRequirement - time: 10800 #40 hrs - - !type:AgeRequirement - requiredAge: 21 + time: 10800 #3 hrs weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 1ddee10e6307..2a07d061d3aa 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -647,6 +647,9 @@ - type: Tag id: ForceNoFixRotations # fixrotations command WON'T target this +- type: Tag + id: FreezerElectronics + - type: Tag id: Fruit diff --git a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json index bbb0aac66482..a470e0094432 100644 --- a/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json @@ -20,7 +20,7 @@ }, { "name": "inhand-right", - "direction": 4 + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png new file mode 100644 index 000000000000..427129da0ed3 Binary files /dev/null and b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png differ diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json index d5fad5600621..e7415fe1c271 100644 --- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github), cart-sec made by dieselmohawk (discord)", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github), cart-sec made by dieselmohawk (discord), cart-nav made by ArchRBX (github)", "size": { "x": 32, "y": 32 @@ -58,6 +58,9 @@ { "name": "cart-mi" }, + { + "name": "cart-nav" + }, { "name": "cart-ord" }, @@ -70,6 +73,9 @@ { "name": "cart-s" }, + { + "name": "cart-sec" + }, { "name": "cart-tear" }, @@ -79,9 +85,6 @@ { "name": "cart-y" }, - { - "name": "cart-sec" - }, { "name": "insert_overlay" } diff --git a/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png new file mode 100644 index 000000000000..ab148aa7cb25 Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 329c7b5a4f88..5600268fde35 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -308,6 +308,9 @@ { "name": "freezer" }, + { + "name": "freezer_icon" + }, { "name": "freezer_door" },