diff --git a/Content.Client/Wall/Components/LowWallComponent.cs b/Content.Client/Wall/Components/LowWallComponent.cs index 3743056b54..93a009cf12 100644 --- a/Content.Client/Wall/Components/LowWallComponent.cs +++ b/Content.Client/Wall/Components/LowWallComponent.cs @@ -206,7 +206,7 @@ namespace Content.Client.Wall.Components { if (Owner.EntityManager.TryGetComponent(entity, out WindowComponent? window)) { - window.UpdateSprite(); + //window.UpdateSprite(); } } } diff --git a/Content.Client/Window/WindowComponent.cs b/Content.Client/Window/WindowComponent.cs index d7e3864d93..fdf936629b 100644 --- a/Content.Client/Window/WindowComponent.cs +++ b/Content.Client/Window/WindowComponent.cs @@ -1,116 +1,11 @@ -using System.Diagnostics.CodeAnalysis; -using Content.Client.Wall.Components; using Content.Shared.Window; -using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Map; -using Robust.Shared.Serialization.Manager.Attributes; -using static Content.Client.IconSmoothing.IconSmoothComponent; namespace Content.Client.Window { [RegisterComponent] [ComponentReference(typeof(SharedWindowComponent))] - public sealed class WindowComponent : SharedWindowComponent + public class WindowComponent : SharedWindowComponent { - [Dependency] private readonly IMapManager _mapManager = default!; - - [DataField("base")] - private string? _stateBase; - - private ISpriteComponent? _sprite; - - protected override void Initialize() - { - base.Initialize(); - - _sprite = Owner.GetComponent(); - } - - /// - protected override void Startup() - { - base.Startup(); - - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new WindowSmoothDirtyEvent(Owner)); - - if (_sprite != null) - { - var state0 = $"{_stateBase}0"; - const string cracksRSIPath = "/Textures/Structures/Windows/cracks.rsi"; - _sprite.LayerMapSet(CornerLayers.SE, _sprite.AddLayerState(state0)); - _sprite.LayerSetDirOffset(CornerLayers.SE, SpriteComponent.DirectionOffset.None); - _sprite.LayerMapSet(WindowDamageLayers.DamageSE, _sprite.AddLayerState("0_1", cracksRSIPath)); - _sprite.LayerSetVisible(WindowDamageLayers.DamageSE, false); - - _sprite.LayerMapSet(CornerLayers.NE, _sprite.AddLayerState(state0)); - _sprite.LayerSetDirOffset(CornerLayers.NE, SpriteComponent.DirectionOffset.CounterClockwise); - _sprite.LayerMapSet(WindowDamageLayers.DamageNE, _sprite.AddLayerState("0_1", cracksRSIPath)); - _sprite.LayerSetDirOffset(WindowDamageLayers.DamageNE, SpriteComponent.DirectionOffset.CounterClockwise); - _sprite.LayerSetVisible(WindowDamageLayers.DamageNE, false); - - _sprite.LayerMapSet(CornerLayers.NW, _sprite.AddLayerState(state0)); - _sprite.LayerSetDirOffset(CornerLayers.NW, SpriteComponent.DirectionOffset.Flip); - _sprite.LayerMapSet(WindowDamageLayers.DamageNW, _sprite.AddLayerState("0_1", cracksRSIPath)); - _sprite.LayerSetDirOffset(WindowDamageLayers.DamageNW, SpriteComponent.DirectionOffset.Flip); - _sprite.LayerSetVisible(WindowDamageLayers.DamageNW, false); - - _sprite.LayerMapSet(CornerLayers.SW, _sprite.AddLayerState(state0)); - _sprite.LayerSetDirOffset(CornerLayers.SW, SpriteComponent.DirectionOffset.Clockwise); - _sprite.LayerMapSet(WindowDamageLayers.DamageSW, _sprite.AddLayerState("0_1", cracksRSIPath)); - _sprite.LayerSetDirOffset(WindowDamageLayers.DamageSW, SpriteComponent.DirectionOffset.Clockwise); - _sprite.LayerSetVisible(WindowDamageLayers.DamageSW, false); - } - } - - public void AnchorStateChanged() - { - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new WindowSmoothDirtyEvent(Owner)); - } - - public void UpdateSprite() - { - var lowWall = FindLowWall(); - if (lowWall == null) - { - return; - } - - if (_sprite != null) - { - _sprite.LayerSetState(CornerLayers.NE, $"{_stateBase}{(int) lowWall.LastCornerNE}"); - _sprite.LayerSetState(CornerLayers.SE, $"{_stateBase}{(int) lowWall.LastCornerSE}"); - _sprite.LayerSetState(CornerLayers.SW, $"{_stateBase}{(int) lowWall.LastCornerSW}"); - _sprite.LayerSetState(CornerLayers.NW, $"{_stateBase}{(int) lowWall.LastCornerNW}"); - } - } - - private LowWallComponent? FindLowWall() - { - if (!Owner.Transform.Anchored) - return null; - - var grid = _mapManager.GetGrid(Owner.Transform.GridID); - var coords = Owner.Transform.Coordinates; - foreach (var entity in grid.GetLocal(coords)) - { - if (Owner.EntityManager.TryGetComponent(entity, out LowWallComponent? lowWall)) - { - return lowWall; - } - } - - return null; - } - } - - [SuppressMessage("ReSharper", "InconsistentNaming")] - public enum WindowDamageLayers : byte - { - DamageSE, - DamageNE, - DamageNW, - DamageSW } } diff --git a/Content.Client/Window/WindowSystem.cs b/Content.Client/Window/WindowSystem.cs deleted file mode 100644 index b43eff1d39..0000000000 --- a/Content.Client/Window/WindowSystem.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Collections.Generic; -using JetBrains.Annotations; -using Robust.Shared.GameObjects; - -namespace Content.Client.Window -{ - [UsedImplicitly] - public sealed class WindowSystem : EntitySystem - { - private readonly Queue _dirtyEntities = new(); - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(HandleDirtyEvent); - SubscribeLocalEvent(HandleAnchorChanged); - } - - private void HandleDirtyEvent(WindowSmoothDirtyEvent ev) - { - if (ev.Sender.HasComponent()) - { - _dirtyEntities.Enqueue(ev.Sender); - } - } - - private static void HandleAnchorChanged(EntityUid uid, WindowComponent component, ref AnchorStateChangedEvent args) - { - component.AnchorStateChanged(); - } - - public override void FrameUpdate(float frameTime) - { - base.FrameUpdate(frameTime); - - // Performance: This could be spread over multiple updates, or made parallel. - while (_dirtyEntities.Count > 0) - { - var entity = _dirtyEntities.Dequeue(); - if (entity.Deleted) - { - continue; - } - - entity.GetComponent().UpdateSprite(); - } - } - } - - /// - /// Event raised by a when it needs to be recalculated. - /// - public sealed class WindowSmoothDirtyEvent : EntityEventArgs - { - public IEntity Sender { get; } - - public WindowSmoothDirtyEvent(IEntity sender) - { - Sender = sender; - } - } -} diff --git a/Content.Client/Window/WindowVisualizer.cs b/Content.Client/Window/WindowVisualizer.cs index 54fcc89768..7bdf675455 100644 --- a/Content.Client/Window/WindowVisualizer.cs +++ b/Content.Client/Window/WindowVisualizer.cs @@ -1,68 +1,59 @@ using System; -using Content.Client.Wall.Components; using Content.Shared.Rounding; using Content.Shared.Window; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Map; +using Robust.Shared.Log; +using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Utility; namespace Content.Client.Window { [UsedImplicitly] public sealed class WindowVisualizer : AppearanceVisualizer { + [DataField("crackRsi")] + public ResourcePath CrackRsi { get; } = new ("/Textures/Structures/Windows/cracks.rsi"); + + public override void InitializeEntity(IEntity entity) + { + if (!entity.TryGetComponent(out ISpriteComponent? sprite)) + return; + + sprite.LayerMapReserveBlank(WindowDamageLayers.Layer); + sprite.LayerSetVisible(WindowDamageLayers.Layer, false); + sprite.LayerSetRSI(WindowDamageLayers.Layer, CrackRsi); + } + public override void OnChangeData(AppearanceComponent component) { base.OnChangeData(component); - var sprite = component.Owner.GetComponent(); - if (!component.Owner.Transform.Anchored) - return; - - var lowWall = FindLowWall(IoCManager.Resolve(), component.Owner.Transform); - if (lowWall == null) + if (!component.Owner.TryGetComponent(out ISpriteComponent? sprite)) return; if (component.TryGetData(WindowVisuals.Damage, out float fraction)) { - var level = Math.Min(ContentHelpers.RoundToLevels(fraction, 1, 7), 5); + var level = Math.Min(ContentHelpers.RoundToLevels(fraction, 1, 5), 3); + if (level == 0) { - foreach (var val in Enum.GetValues(typeof(WindowDamageLayers))) - { - if (val == null) continue; - sprite.LayerSetVisible((WindowDamageLayers) val, false); - } + sprite.LayerSetVisible(WindowDamageLayers.Layer, false); return; } - foreach (var val in Enum.GetValues(typeof(WindowDamageLayers))) - { - if (val == null) continue; - sprite.LayerSetVisible((WindowDamageLayers) val, true); - } - sprite.LayerSetState(WindowDamageLayers.DamageNE, $"{(int) lowWall.LastCornerNE}_{level}"); - sprite.LayerSetState(WindowDamageLayers.DamageSE, $"{(int) lowWall.LastCornerSE}_{level}"); - sprite.LayerSetState(WindowDamageLayers.DamageSW, $"{(int) lowWall.LastCornerSW}_{level}"); - sprite.LayerSetState(WindowDamageLayers.DamageNW, $"{(int) lowWall.LastCornerNW}_{level}"); + Logger.Info($"LEVEL: {level} DMG: {fraction}"); + + sprite.LayerSetVisible(WindowDamageLayers.Layer, true); + sprite.LayerSetState(WindowDamageLayers.Layer, $"{level}"); } } - private static LowWallComponent? FindLowWall(IMapManager mapManager, ITransformComponent transform) + public enum WindowDamageLayers : byte { - var grid = mapManager.GetGrid(transform.GridID); - var coords = transform.Coordinates; - foreach (var entity in grid.GetLocal(coords)) - { - if (transform.Owner.EntityManager.TryGetComponent(entity, out LowWallComponent? lowWall)) - { - return lowWall; - } - } - return null; + Layer, } } } diff --git a/Content.Shared/Window/SharedWindowComponent.cs b/Content.Shared/Window/SharedWindowComponent.cs index f2be96b98d..1e2f451c07 100644 --- a/Content.Shared/Window/SharedWindowComponent.cs +++ b/Content.Shared/Window/SharedWindowComponent.cs @@ -1,17 +1,11 @@ -using System; using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; +using Robust.Shared.GameStates; namespace Content.Shared.Window { + [NetworkedComponent] public class SharedWindowComponent : Component { public override string Name => "Window"; } - - [Serializable, NetSerializable] - public enum WindowVisuals - { - Damage - } } diff --git a/Content.Shared/Window/WindowVisuals.cs b/Content.Shared/Window/WindowVisuals.cs new file mode 100644 index 0000000000..20081129a4 --- /dev/null +++ b/Content.Shared/Window/WindowVisuals.cs @@ -0,0 +1,12 @@ +using System; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; + +namespace Content.Shared.Window +{ + [Serializable, NetSerializable] + public enum WindowVisuals + { + Damage + } +} diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 948673c333..e336ae86e5 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -12,93 +12,91 @@ tilemap: 5: floor_asteroid_sand 6: floor_asteroid_tile 7: floor_blue - 8: floor_dark - 9: floor_elevator_shaft - 10: floor_freezer - 11: floor_glass - 12: floor_gold - 13: floor_green_circuit - 14: floor_hydro - 15: floor_lino - 16: floor_mono - 17: floor_reinforced - 18: floor_rglass - 19: floor_rock_vault - 20: floor_showroom - 21: floor_snow - 22: floor_steel - 23: floor_steel_dirty - 24: floor_techmaint - 25: floor_warning1 - 26: floor_warning2 + 8: floor_blue_circuit + 9: floor_dark + 10: floor_elevator_shaft + 11: floor_freezer + 12: floor_glass + 13: floor_gold + 14: floor_green_circuit + 15: floor_hydro + 16: floor_lino + 17: floor_mono + 18: floor_reinforced + 19: floor_rglass + 20: floor_rock_vault + 21: floor_showroom + 22: floor_silver + 23: floor_snow + 24: floor_steel + 25: floor_steel_dirty + 26: floor_techmaint 27: floor_white - 28: floor_white_warning1 - 29: floor_white_warning2 - 30: floor_wood - 31: lattice - 32: plating - 33: underplating + 28: floor_wood + 29: lattice + 30: plating + 31: underplating grids: - settings: chunksize: 16 tilesize: 1 chunks: - ind: "-1,-1" - tiles: GAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAGAAAACEAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAhAAAAIQAAABgAAAAhAAAAIQAAACEAAAAgAAAAGAAAABgAAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAIAAAABgAAAAYAAAAIQAAABsAAAAbAAAAGwAAACEAAAAhAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAACAAAAAYAAAAGAAAACEAAAAhAAAAGwAAACEAAAAhAAAAIAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAIAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAABgAAAAhAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAeAAAAHgAAAB4AAAAeAAAAGAAAAA8AAAAPAAAADwAAAA8AAAAPAAAAIQAAABgAAAAYAAAAIAAAABgAAAAgAAAAHgAAAB4AAAAeAAAAHgAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAACEAAAAYAAAAGAAAACAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAADwAAAA8AAAAPAAAADwAAAA8AAAAhAAAAIQAAACEAAAAgAAAAFgAAAAoAAAAKAAAACgAAAAoAAAAKAAAAIQAAAA8AAAAPAAAADwAAAA8AAAAPAAAAHgAAAB4AAAAeAAAAIQAAACEAAAAKAAAACgAAAAoAAAAKAAAACgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAhAAAAIQAAABYAAAAhAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAIQAAABsAAAAbAAAAGwAAABsAAAAWAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAA== + tiles: GgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAHwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAaAAAAGgAAAB8AAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAfAAAAHwAAABoAAAAfAAAAHwAAAB8AAAAeAAAAGgAAABoAAAAfAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGgAAABoAAAAaAAAAGgAAABoAAAAfAAAAHgAAABoAAAAaAAAAHwAAABsAAAAbAAAAGwAAAB8AAAAfAAAAHwAAABoAAAAaAAAAGgAAABoAAAAaAAAAHwAAAB4AAAAaAAAAGgAAAB8AAAAfAAAAGwAAAB8AAAAfAAAAHgAAAB4AAAAaAAAAGgAAABoAAAAaAAAAGgAAAB8AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAGgAAABoAAAAaAAAAGgAAABoAAAAfAAAAHgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAHwAAABoAAAAfAAAAHwAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAGgAAABoAAAAaAAAAGgAAABoAAAAcAAAAHAAAABwAAAAcAAAAGgAAABAAAAAQAAAAEAAAABAAAAAQAAAAHwAAABoAAAAaAAAAHgAAABoAAAAeAAAAHAAAABwAAAAcAAAAHAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAAB8AAAAaAAAAGgAAAB4AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAEAAAABAAAAAQAAAAEAAAABAAAAAfAAAAHwAAAB8AAAAeAAAAGAAAAAsAAAALAAAACwAAAAsAAAALAAAAHwAAABAAAAAQAAAAEAAAABAAAAAQAAAAHAAAABwAAAAcAAAAHwAAAB8AAAALAAAACwAAAAsAAAALAAAACwAAAB8AAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB8AAAAfAAAAHwAAABgAAAAfAAAAHwAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAfAAAAGwAAABsAAAAbAAAAGwAAABsAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHwAAABsAAAAbAAAAGwAAABsAAAAYAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAA== - ind: "-1,0" - tiles: FgAAABsAAAAbAAAAGwAAABsAAAAWAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAbAAAAGwAAABsAAAAbAAAAFgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAABYAAAAWAAAAIAAAABYAAAAWAAAAIAAAACAAAAAgAAAAFgAAABYAAAAgAAAAFgAAACAAAAAWAAAAFgAAACAAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAgAAAAIAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAgAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIAAAACAAAAAgAAAAFgAAACAAAAAWAAAAIAAAABYAAAAgAAAAIAAAABYAAAAWAAAAIAAAACAAAAAgAAAAIAAAACAAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAgAAAAGAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAAA== + tiles: GAAAABsAAAAbAAAAGwAAABsAAAAYAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB8AAAAbAAAAGwAAABsAAAAbAAAAGAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAABgAAAAYAAAAHgAAABgAAAAYAAAAHgAAAB4AAAAeAAAAGAAAABgAAAAeAAAAGAAAAB4AAAAYAAAAGAAAAB4AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAeAAAAHgAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAeAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHgAAAB4AAAAeAAAAGAAAAB4AAAAYAAAAHgAAABgAAAAeAAAAHgAAABgAAAAYAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAeAAAAGgAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAA== - ind: "0,-1" - tiles: GwAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAGwAAABsAAAAbAAAAGwAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAbAAAAIQAAACEAAAAhAAAAGwAAABsAAAAbAAAAIQAAACAAAAAhAAAAFgAAABYAAAAWAAAAIQAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAgAAAAIQAAABYAAAAWAAAAFgAAACEAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAIAAAACEAAAAWAAAAFgAAABYAAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAACAAAAAhAAAAFgAAABYAAAAWAAAAIQAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAgAAAAGAAAABYAAAAWAAAAFgAAACEAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGAAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAABsAAAAhAAAAIQAAABsAAAAbAAAAIQAAACEAAAAbAAAAGwAAACEAAAAhAAAAFgAAABYAAAAWAAAAIQAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAeAAAAIQAAABYAAAAWAAAAFgAAACEAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAIQAAABsAAAAbAAAAHgAAACEAAAAWAAAAFgAAABYAAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAACEAAAAbAAAAGwAAAB4AAAAWAAAAFgAAABYAAAAWAAAAFgAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAeAAAAFgAAABYAAAAWAAAAFgAAABYAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAHgAAABYAAAAWAAAAFgAAABYAAAAWAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAA== + tiles: GwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABsAAAAbAAAAGwAAABsAAAAfAAAAGwAAABsAAAAbAAAAGwAAABsAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAbAAAAGwAAABsAAAAbAAAAHwAAABsAAAAbAAAAGwAAABsAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHwAAAB8AAAAbAAAAHwAAAB8AAAAfAAAAGwAAABsAAAAbAAAAHwAAAB4AAAAfAAAAGAAAABgAAAAYAAAAHwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAeAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAHgAAAB8AAAAYAAAAGAAAABgAAAAfAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAB4AAAAfAAAAGAAAABgAAAAYAAAAHwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAeAAAAGgAAABgAAAAYAAAAGAAAAB8AAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGgAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHwAAABsAAAAfAAAAHwAAABsAAAAbAAAAHwAAAB8AAAAbAAAAGwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAHwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAfAAAAGwAAABsAAAAcAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAHwAAABsAAAAbAAAAHAAAAB8AAAAYAAAAGAAAABgAAAAfAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAbAAAAGwAAABwAAAAYAAAAGAAAABgAAAAYAAAAGAAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAcAAAAGAAAABgAAAAYAAAAGAAAABgAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAHAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAA== - ind: "0,0" - tiles: HgAAABYAAAAWAAAAFgAAABYAAAAWAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAB4AAAAhAAAAFgAAABYAAAAWAAAAIQAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAhAAAAIQAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIAAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAABYAAAAhAAAAFgAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAFgAAACEAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAYAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAIQAAABYAAAAWAAAAFgAAABgAAAAgAAAAGAAAABgAAAAYAAAAIAAAACAAAAAgAAAAGAAAABgAAAAYAAAAIQAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIAAAABgAAAAhAAAAGAAAAA== + tiles: HAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABwAAAAfAAAAGAAAABgAAAAYAAAAHwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAfAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHgAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHwAAABgAAAAfAAAAGAAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAfAAAAGAAAAB8AAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHwAAAB8AAAAaAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAYAAAAHwAAABgAAAAYAAAAGAAAABoAAAAeAAAAGgAAABoAAAAaAAAAHgAAAB4AAAAeAAAAGgAAABoAAAAaAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHgAAABoAAAAfAAAAGgAAAA== - ind: "1,0" - tiles: GwAAABsAAAAbAAAAGwAAACAAAAAYAAAAGAAAABgAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABsAAAAbAAAAGwAAABsAAAAgAAAAIAAAABgAAAAYAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAACAAAAAgAAAAIQAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAGAAAACAAAAAYAAAAIAAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAYAAAAGAAAABgAAAAYAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAGAAAABgAAAAYAAAAIQAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABgAAAAYAAAAGAAAACEAAAAWAAAAFgAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAIAAAACAAAAAhAAAAFgAAABYAAAAYAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAGAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAAA== + tiles: GwAAABsAAAAbAAAAGwAAAB4AAAAaAAAAGgAAABoAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABsAAAAbAAAAGwAAABsAAAAeAAAAHgAAABoAAAAaAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAABoAAAAfAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAGgAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHgAAAB4AAAAeAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGgAAAB4AAAAaAAAAHgAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAaAAAAGgAAABoAAAAaAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGgAAABoAAAAaAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABoAAAAaAAAAGgAAAB8AAAAYAAAAGAAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAeAAAAHgAAAB4AAAAfAAAAGAAAABgAAAAaAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAYAAAAGgAAABoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAA== - ind: "0,1" - tiles: IQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAhAAAAIQAAABgAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAIAAAACAAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAGAAAACAAAAAgAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAgAAAAIAAAABgAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAGAAAACAAAAAYAAAAGAAAABgAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAYAAAAGAAAABgAAAAYAAAAIQAAACEAAAAWAAAAIQAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAGAAAACEAAAAhAAAAIQAAAA8AAAAhAAAAFgAAABYAAAAWAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAGAAAABgAAAAYAAAAIQAAAAAAAAAPAAAADwAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAIQAAACAAAAAgAAAAIAAAACEAAAAAAAAADwAAAA8AAAAWAAAAFgAAABYAAAAWAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAhAAAAIQAAACEAAAAhAAAAAAAAAA8AAAAhAAAAFgAAABYAAAAWAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAFAAAABQAAAAhAAAAAAAAAAAAAAAhAAAAIQAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: HwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAfAAAAHgAAABoAAAAfAAAAHwAAABoAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAaAAAAHgAAAB4AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAeAAAAGgAAAB4AAAAeAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAfAAAAHgAAABoAAAAeAAAAHgAAABoAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGgAAAB4AAAAaAAAAGgAAABoAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAaAAAAGgAAABoAAAAaAAAAHwAAAB8AAAAYAAAAHwAAABgAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGgAAAB8AAAAfAAAAHwAAABAAAAAfAAAAGAAAABgAAAAYAAAAHwAAABwAAAAcAAAAHAAAABwAAAAfAAAAGgAAABoAAAAaAAAAHwAAAAAAAAAQAAAAEAAAABgAAAAYAAAAGAAAAB8AAAAcAAAAHAAAABwAAAAcAAAAHwAAAB4AAAAeAAAAHgAAAB8AAAAAAAAAEAAAABAAAAAYAAAAGAAAABgAAAAYAAAAHAAAABwAAAAcAAAAHAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAABAAAAAfAAAAGAAAABgAAAAYAAAAHwAAABwAAAAcAAAAHAAAABwAAAAcAAAAFQAAABUAAAAfAAAAAAAAAAAAAAAfAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "-2,0" - tiles: IQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAFgAAABYAAAAWAAAAFgAAACEAAAAOAAAAFgAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAIQAAACEAAAAWAAAAFgAAACEAAAAhAAAADgAAAA4AAAAOAAAADgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAGAAAACAAAAAhAAAAFgAAABYAAAAWAAAAIQAAACEAAAAWAAAAFgAAACEAAAAhAAAAFgAAABYAAAAhAAAAIAAAACAAAAAYAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAGAAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAGAAAABgAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAYAAAAIQAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAhAAAAIQAAABgAAAAhAAAAIQAAACAAAAAgAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAgAAAAGAAAABgAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIAAAACAAAAAgAAAAIAAAABgAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAhAAAAIQAAACAAAAAYAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAgAAAAGAAAAA== + tiles: HwAAABwAAAAcAAAAHAAAABwAAAAcAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAPAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAcAAAAHAAAABwAAAAcAAAAHwAAAB8AAAAYAAAAGAAAAB8AAAAfAAAADwAAAA8AAAAPAAAADwAAABgAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGgAAAB4AAAAfAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAYAAAAGAAAAB8AAAAfAAAAGAAAABgAAAAfAAAAHgAAAB4AAAAaAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAaAAAAGgAAAB8AAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAeAAAAGgAAABoAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHgAAABoAAAAaAAAAHwAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAfAAAAHwAAABoAAAAfAAAAHwAAAB4AAAAeAAAAGgAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAABoAAAAeAAAAGgAAABoAAAAeAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAHgAAAB4AAAAeAAAAHgAAABoAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAfAAAAHwAAAB4AAAAaAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHgAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB4AAAAeAAAAGgAAAA== - ind: "1,-1" - tiles: GwAAABsAAAAbAAAAGwAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAhAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAbAAAAGwAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAGwAAABsAAAAbAAAAGwAAACEAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAgAAAAGAAAACEAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAIAAAABgAAAAhAAAAIAAAACAAAAAgAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAgAAAAIAAAACAAAAAYAAAAGAAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAACEAAAAgAAAAGAAAACEAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAIAAAABgAAAAhAAAAFgAAABYAAAAWAAAAIQAAABsAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAYAAAAIQAAABYAAAAWAAAAFgAAABsAAAAbAAAAGwAAABsAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAACEAAAAWAAAAFgAAABYAAAAbAAAAGwAAABsAAAAbAAAAIAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAFgAAABYAAAAWAAAAGwAAABsAAAAbAAAAGwAAACAAAAAYAAAAGAAAACAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAAA== + tiles: GwAAABsAAAAbAAAAGwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAHwAAAB4AAAAaAAAAHwAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAfAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAeAAAAGgAAAB8AAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAfAAAAHgAAABoAAAAfAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAbAAAAGwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAHwAAAB4AAAAaAAAAHwAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAeAAAAGgAAAB8AAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAGgAAAB4AAAAaAAAAGgAAABoAAAAaAAAAHgAAABoAAAAfAAAAAAAAAAAAAAAAAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAaAAAAHwAAAAAAAAAAAAAAAAAAABsAAAAbAAAAGwAAABsAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAeAAAAGgAAAB8AAAAfAAAAHwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAHwAAABsAAAAbAAAAGwAAABsAAAAfAAAAHgAAABoAAAAfAAAAHgAAAB4AAAAeAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAHwAAAB4AAAAeAAAAHgAAAB4AAAAaAAAAGgAAABsAAAAbAAAAGwAAABsAAAAfAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAeAAAAGgAAAB8AAAAfAAAAHwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAHwAAABsAAAAbAAAAGwAAABsAAAAfAAAAHgAAABoAAAAfAAAAGAAAABgAAAAYAAAAHwAAABsAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB4AAAAaAAAAHwAAABgAAAAYAAAAGAAAABsAAAAbAAAAGwAAABsAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAGgAAAB8AAAAYAAAAGAAAABgAAAAbAAAAGwAAABsAAAAbAAAAHgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAfAAAAGAAAABgAAAAYAAAAGwAAABsAAAAbAAAAGwAAAB4AAAAaAAAAGgAAAB4AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAAA== - ind: "0,-2" - tiles: AAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAIQAAAB4AAAAeAAAAIQAAAAAAAAAAAAAAIQAAACEAAAAWAAAAFgAAABYAAAAhAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAABgAAAAhAAAAFgAAABYAAAAWAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAAAAAAAAAAAAYAAAAIQAAABYAAAAWAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAIQAAACEAAAAhAAAAGAAAACEAAAAWAAAAFgAAABYAAAAhAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAgAAAAIAAAABgAAAAhAAAAFgAAABYAAAAWAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAhAAAAIAAAABgAAAAgAAAAGAAAABYAAAAWAAAAFgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAIQAAACAAAAAYAAAAIQAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAgAAAAGAAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIAAAABgAAAAbAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAGwAAABYAAAAWAAAAFgAAABYAAAAWAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAgAAAAGAAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAYAAAAGAAAABgAAAAYAAAAIQAAACEAAAAhAAAAGAAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAAA== + tiles: AAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAfAAAAGAAAABgAAAAYAAAAHwAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAfAAAAAAAAAAAAAAAAAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAcAAAAHAAAABwAAAAcAAAAHwAAABwAAAAcAAAAHwAAAAAAAAAAAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHAAAABwAAAAcAAAAHAAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAABoAAAAfAAAAGAAAABgAAAAYAAAAHwAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAfAAAAAAAAAAAAAAAaAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHwAAAB8AAAAfAAAAGgAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB8AAAAeAAAAHgAAABoAAAAfAAAAGAAAABgAAAAYAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAfAAAAHgAAABoAAAAeAAAAGgAAABgAAAAYAAAAGAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAABwAAAAcAAAAHwAAAB4AAAAaAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHwAAABwAAAAcAAAAHAAAABwAAAAcAAAAHAAAAB8AAAAeAAAAGgAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAfAAAAGgAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHgAAABoAAAAbAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAaAAAAGwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGgAAAB4AAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAeAAAAGgAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAaAAAAGgAAABoAAAAaAAAAHwAAAB8AAAAfAAAAGgAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABsAAAAbAAAAGwAAABsAAAAfAAAAGwAAABsAAAAbAAAAGwAAAA== - ind: "1,-2" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAgAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAIQAAABsAAAAbAAAAGwAAACEAAAAYAAAAIAAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAAAAAAAAAAAAAAAACEAAAAbAAAAGwAAABsAAAAhAAAAGAAAACAAAAAhAAAAGAAAABgAAAAYAAAAGAAAABgAAAAAAAAAAAAAAAAAAAAgAAAAGwAAABsAAAAbAAAAIQAAABgAAAAgAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAGAAAABsAAAAbAAAAGwAAACEAAAAYAAAAIAAAACEAAAAhAAAAIQAAABgAAAAhAAAAIQAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAABsAAAAhAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAGwAAABsAAAAbAAAAGwAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAABoAAAAaAAAAGgAAABoAAAAaAAAAAAAAAAAAAAAAAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB8AAAAaAAAAGgAAABoAAAAaAAAAGgAAAAAAAAAAAAAAAAAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAB4AAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAHwAAABoAAAAeAAAAHwAAABoAAAAaAAAAGgAAABoAAAAaAAAAAAAAAAAAAAAAAAAAHwAAABsAAAAbAAAAGwAAAB8AAAAaAAAAHgAAAB8AAAAaAAAAGgAAABoAAAAaAAAAGgAAAAAAAAAAAAAAAAAAAB8AAAAbAAAAGwAAABsAAAAfAAAAGgAAAB4AAAAfAAAAGgAAABoAAAAaAAAAGgAAABoAAAAAAAAAAAAAAAAAAAAeAAAAGwAAABsAAAAbAAAAHwAAABoAAAAeAAAAHwAAABoAAAAaAAAAGgAAABoAAAAaAAAAAAAAAAAAAAAAAAAAGgAAABsAAAAbAAAAGwAAAB8AAAAaAAAAHgAAAB8AAAAfAAAAHwAAABoAAAAfAAAAHwAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAABsAAAAfAAAAGgAAAB4AAAAaAAAAGgAAABoAAAAaAAAAGgAAAB8AAAAAAAAAAAAAAAAAAAAbAAAAGwAAABsAAAAbAAAAHwAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAABoAAAAfAAAAAAAAAAAAAAAAAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB4AAAAaAAAAHwAAAAAAAAAAAAAAAAAAAA== - ind: "-1,1" - tiles: IQAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAGAAAABgAAAAYAAAAGAAAACEAAAAhAAAAIQAAABYAAAAhAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABgAAAAYAAAAGAAAABgAAAAhAAAAEQAAABEAAAARAAAAEQAAACEAAAAhAAAAFgAAACEAAAAhAAAAIQAAACEAAAAYAAAAGAAAABgAAAAYAAAAIQAAABEAAAARAAAAEQAAABEAAAAhAAAACAAAAAgAAAAIAAAACAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAARAAAAEQAAABEAAAARAAAAFgAAAAgAAAAeAAAAHgAAAB4AAAAhAAAAGAAAABgAAAAYAAAAGAAAACAAAAAhAAAAEQAAABEAAAARAAAAEQAAACEAAAAIAAAAHgAAAB4AAAAeAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAACAAAAB4AAAAeAAAAHgAAACEAAAAgAAAAIQAAACEAAAAPAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABgAAAAYAAAAGAAAABgAAAAYAAAAIAAAACEAAAAPAAAADwAAAA8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAgAAAAIAAAACAAAAAhAAAADwAAAA8AAAAPAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIQAAACEAAAAhAAAAIQAAAA8AAAAPAAAADwAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAACEAAAAPAAAADwAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAWAAAAFgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAWAAAAFgAAAA== + tiles: HwAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGgAAABoAAAAaAAAAGgAAAB8AAAAfAAAAHwAAABgAAAAfAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABoAAAAaAAAAGgAAABoAAAAfAAAAEgAAABIAAAASAAAAEgAAAB8AAAAfAAAAGAAAAB8AAAAfAAAAHwAAAB8AAAAaAAAAGgAAABoAAAAaAAAAHwAAABIAAAASAAAAEgAAABIAAAAfAAAACQAAAAkAAAAJAAAACQAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAASAAAAEgAAABIAAAASAAAAGAAAAAkAAAAcAAAAHAAAABwAAAAfAAAAGgAAABoAAAAaAAAAGgAAAB4AAAAfAAAAEgAAABIAAAASAAAAEgAAAB8AAAAJAAAAHAAAABwAAAAcAAAAHwAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAACQAAABwAAAAcAAAAHAAAAB8AAAAeAAAAHwAAAB8AAAAQAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAABoAAAAaAAAAGgAAABoAAAAaAAAAHgAAAB8AAAAQAAAAEAAAABAAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAB4AAAAeAAAAHgAAAB4AAAAfAAAAEAAAABAAAAAQAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHwAAAB8AAAAfAAAAHwAAABAAAAAQAAAAEAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAB8AAAAQAAAAEAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABgAAAAYAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAYAAAAGAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAYAAAAGAAAAA== - ind: "-2,1" - tiles: AAAAAAAAAAAAAAAAAAAAACEAAAAYAAAAIAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAYAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABgAAAAgAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAYAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAhAAAAIAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAgAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAB8AAAAaAAAAHgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAB4AAAAaAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGgAAAB4AAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAeAAAAGgAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAHwAAABoAAAAeAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAHgAAABoAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAaAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAaAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAB8AAAAeAAAAGgAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAfAAAAHgAAABoAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB4AAAAaAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAeAAAAGgAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHgAAABoAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB4AAAAeAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "-1,2" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "1,1" - tiles: IQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: HwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "0,2" - tiles: FgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: GAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "2,0" - tiles: FgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAYAAAAIQAAACEAAAAhAAAAIQAAACEAAAAWAAAAIQAAACEAAAAhAAAAIQAAABYAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAACEAAAAWAAAAIQAAACEAAAAhAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAEQAAABEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAARAAAAEQAAABEAAAARAAAAEQAAABEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAEQAAABEAAAARAAAAEQAAABEAAAARAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABEAAAARAAAAEQAAABEAAAARAAAAEQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: GAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAaAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAYAAAAHwAAAB8AAAAfAAAAHwAAABgAAAAfAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAAB8AAAAYAAAAHwAAAB8AAAAfAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAEgAAABIAAAAfAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAASAAAAEgAAABIAAAASAAAAEgAAABIAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAEgAAABIAAAASAAAAEgAAABIAAAASAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABIAAAASAAAAEgAAABIAAAASAAAAEgAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "3,0" - tiles: FgAAABYAAAAWAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: GAAAABgAAAAYAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "2,-1" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAABgAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAGAAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAYAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAIQAAACEAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAGAAAACAAAAAYAAAAGAAAABgAAAAYAAAAIAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAACEAAAAYAAAAIQAAACEAAAAhAAAAGAAAACAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAIQAAACAAAAAWAAAAFgAAABYAAAAWAAAAIQAAABgAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAhAAAAAAAAACEAAAAgAAAAFgAAABYAAAAWAAAAFgAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAIQAAAAAAAAAhAAAAIAAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAgAAAAGAAAACEAAAAAAAAAIQAAACAAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAhAAAAAAAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAIQAAAAAAAAAAAAAAIQAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAABoAAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAGgAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAaAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAGgAAAB4AAAAaAAAAGgAAABoAAAAaAAAAHgAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHgAAAB8AAAAaAAAAHwAAAB8AAAAfAAAAGgAAAB4AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAHwAAAB4AAAAYAAAAGAAAABgAAAAYAAAAHwAAABoAAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAfAAAAAAAAAB8AAAAeAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAHwAAAAAAAAAfAAAAHgAAABgAAAAYAAAAGAAAABgAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAeAAAAGgAAAB8AAAAAAAAAHwAAAB4AAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAfAAAAHgAAABoAAAAfAAAAAAAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAaAAAAHwAAAAAAAAAAAAAAHwAAAA== - ind: "-1,-2" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAYAAAAGAAAABgAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAGAAAABgAAAAYAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAARAAAAEQAAABEAAAAhAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAEQAAABEAAAARAAAAIQAAACAAAAAhAAAAGAAAABgAAAAYAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIAAAABEAAAARAAAAEQAAACEAAAAgAAAAIQAAACEAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAbAAAAIQAAACAAAAAbAAAAGwAAACEAAAAhAAAAIAAAACEAAAAYAAAAGAAAABgAAAAhAAAAGwAAABsAAAAbAAAAGwAAACEAAAAgAAAAGwAAABsAAAAbAAAAIQAAACAAAAAhAAAAGAAAABgAAAAYAAAAIQAAABsAAAAbAAAAGwAAABsAAAAhAAAAIAAAABsAAAAbAAAAGwAAACEAAAAYAAAAIQAAACEAAAAbAAAAIQAAACEAAAAhAAAAIQAAABsAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAACEAAAAbAAAAGwAAABsAAAAbAAAAGwAAACEAAAAhAAAAIQAAABsAAAAhAAAAIQAAACEAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAhAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAaAAAAGgAAABoAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAGgAAABoAAAAaAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAASAAAAEgAAABIAAAAfAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAEgAAABIAAAASAAAAHwAAAB4AAAAfAAAAGgAAABoAAAAaAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHgAAABIAAAASAAAAEgAAAB8AAAAeAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAHwAAAB4AAAAbAAAAGwAAAB8AAAAfAAAAHgAAAB8AAAAaAAAAGgAAABoAAAAfAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAeAAAAGwAAABsAAAAbAAAAHwAAAB4AAAAfAAAAGgAAABoAAAAaAAAAHwAAABsAAAAbAAAAGwAAABsAAAAfAAAAHgAAABsAAAAbAAAAGwAAAB8AAAAaAAAAHwAAAB8AAAAbAAAAHwAAAB8AAAAfAAAAHwAAABsAAAAfAAAAHwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAbAAAAGwAAABsAAAAbAAAAGwAAAB8AAAAfAAAAHwAAABsAAAAfAAAAHwAAAB8AAAAbAAAAGwAAABsAAAAfAAAAGwAAABsAAAAbAAAAGwAAABsAAAAfAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAAA== - ind: "-2,-2" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABEAAAARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAARAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAEQAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAbAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGwAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABsAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAbAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGwAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABsAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAGAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABIAAAASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAASAAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAEgAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAbAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGwAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABsAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAbAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGwAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABsAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGgAAAA== - ind: "-2,-1" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAIAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAYAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAYAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAYAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAYAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAhAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAABYAAAAWAAAAFgAAABYAAAAhAAAADgAAAA4AAAAOAAAADgAAABYAAAAhAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAAA4AAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAOAAAADgAAAA4AAAAWAAAAFgAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAaAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAeAAAAHgAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHgAAABoAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB4AAAAaAAAAHwAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAHgAAAB4AAAAeAAAAGgAAAB8AAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAB4AAAAaAAAAGgAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAaAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAaAAAAGgAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAcAAAAHAAAABwAAAAcAAAAHAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAfAAAAHAAAABwAAAAcAAAAHAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAeAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAAB8AAAAcAAAAHAAAABwAAAAcAAAAHAAAABgAAAAYAAAAGAAAABgAAAAfAAAADwAAAA8AAAAPAAAADwAAABgAAAAfAAAAHAAAABwAAAAcAAAAHAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAHwAAAA8AAAAYAAAAGAAAABgAAAAYAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAPAAAADwAAAA8AAAAYAAAAGAAAAA== - ind: "-3,0" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAACEAAAAgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAWAAAAFgAAABYAAAAWAAAAFgAAABgAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAeAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHwAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAB8AAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoAAAAaAAAAGgAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAGgAAABoAAAAYAAAAGAAAABgAAAAYAAAAGAAAABoAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAfAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAA== - ind: "-3,-1" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAABgAAAAgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAABYAAAAWAAAAIQAAACAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAWAAAAFgAAACEAAAAgAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAFgAAABYAAAAhAAAAIAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAACEAAAAgAAAAGAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHgAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB4AAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAeAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHgAAABoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABgAAAAYAAAAGAAAABoAAAAeAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAYAAAAGAAAABgAAAAfAAAAHgAAABoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAABgAAAAYAAAAHwAAAB4AAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAGgAAABoAAAAYAAAAGAAAAB8AAAAeAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAGAAAABgAAAAfAAAAHgAAABoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGAAAABgAAAAYAAAAHwAAAB4AAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAABgAAAAYAAAAGAAAAB8AAAAeAAAAGgAAAA== - ind: "3,-1" - tiles: AAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAIQAAACEAAAAYAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAhAAAAIQAAABgAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAIQAAABgAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGAAAACEAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAACAAAAAgAAAAIAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAACAAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAgAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAIAAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAgAAAAIAAAACAAAAAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGAAAACEAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAABoAAAAaAAAAHwAAAB8AAAAaAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoAAAAaAAAAGgAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAGgAAABoAAAAfAAAAHwAAABoAAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAABoAAAAaAAAAHwAAABoAAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGgAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAB4AAAAeAAAAHgAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoAAAAaAAAAGgAAAB4AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAGgAAABoAAAAeAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAABoAAAAaAAAAHgAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAeAAAAHgAAAB4AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAGgAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAYAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "2,-2" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAHwAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAHwAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAHwAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAHQAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAHQAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAHQAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAA== - ind: "3,-2" - tiles: HwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAHwAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAHwAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAHwAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAAAAAAAHwAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: HQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAHQAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAHQAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAHQAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAdAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAHQAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "3,-3" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== - ind: "2,-3" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAHQAAAB0AAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAA== entities: - uid: 0 type: SuspicionHitscanSpawner @@ -446,17 +444,12 @@ entities: parent: 853 type: Transform - uid: 49 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -35.09421,0.5072632 + - rot: 1.5707963267948966 rad + pos: -25.5,6.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 50 type: Table components: @@ -605,8 +598,6 @@ entities: - pos: -11.5,-17.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 69 @@ -777,21 +768,21 @@ entities: parent: 853 type: Transform - uid: 91 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 28.5,14.5 parent: 853 type: Transform - uid: 92 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 27.5,14.5 parent: 853 type: Transform - uid: 93 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 26.5,14.5 @@ -981,8 +972,6 @@ entities: - pos: -8.5,1.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 121 @@ -1066,8 +1055,6 @@ entities: - pos: -22.5,0.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 131 @@ -1097,41 +1084,25 @@ entities: parent: 853 type: Transform - uid: 134 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 36.928772,12.48564 + - rot: 1.5707963267948966 rad + pos: 46.5,6.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 135 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 4.9229045,12.440822 + - pos: 13.5,-7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 136 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -13.082766,-25.616213 + - rot: 1.5707963267948966 rad + pos: -5.5,-14.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 137 type: PlaqueAtmos components: @@ -1152,33 +1123,23 @@ entities: - uid: 139 type: SignBridge components: - - rot: 1.5707963705062866 rad - pos: 5.6507263,22.5 + - pos: 5.5,22.5 parent: 853 type: Transform - uid: 140 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963705062866 rad - pos: -25.939785,7 + - rot: -1.5707963267948966 rad + pos: 12.5,-3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 141 - type: Poweredlight + type: WallSolid components: - - pos: -18.508244,-7.132841 + - rot: -1.5707963267948966 rad + pos: -15.5,-1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 142 type: SignRND components: @@ -1208,17 +1169,12 @@ entities: parent: 853 type: Transform - uid: 146 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 45.108562,12.421564 + - rot: -1.5707963267948966 rad + pos: 9.5,25.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 147 type: SignEVA components: @@ -1300,7 +1256,7 @@ entities: parent: 853 type: Transform - uid: 157 - type: LowWall + type: Grille components: - pos: -1.5,13.5 parent: 853 @@ -1751,8 +1707,6 @@ entities: pos: -28.5,11.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 192 @@ -2067,7 +2021,7 @@ entities: - canCollide: False type: Physics - uid: 216 - type: LowWall + type: Grille components: - pos: -10.5,6.5 parent: 853 @@ -3261,16 +3215,11 @@ entities: ents: [] type: ContainerContainer - uid: 300 - type: Poweredlight + type: WallLight components: - - pos: -4.226936,15.0964775 + - pos: 8.5,21.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 301 type: DisposalPipe components: @@ -5177,7 +5126,7 @@ entities: parent: 853 type: Transform - uid: 467 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -35.5,11.5 @@ -5420,17 +5369,11 @@ entities: parent: 853 type: Transform - uid: 502 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -38.60578,1.9956734 + - pos: -1.5,-13.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 503 type: RandomSpawner components: @@ -5509,40 +5452,26 @@ entities: parent: 853 type: Transform - uid: 514 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 9.916167,-29.48114 + - rot: 3.141592653589793 rad + pos: 12.5,-10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 515 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -20.5,-3 + - pos: 28.5,6.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 516 - type: Poweredlight + type: ExtinguisherCabinetFilled components: - - rot: -1.5707963267948966 rad - pos: -21.136164,-6.519089 + - pos: -10.5,12.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - containers: - light_bulb: !type:ContainerSlot {} + cabinetSlot: !type:ContainerSlot {} type: ContainerContainer - uid: 517 type: Catwalk @@ -5832,7 +5761,8 @@ entities: - uid: 555 type: EmergencyLight components: - - pos: 0.49181414,14.9871025 + - rot: 3.141592653589793 rad + pos: 9.5,28.5 parent: 853 type: Transform - uid: 556 @@ -5850,16 +5780,11 @@ entities: parent: 853 type: Transform - uid: 558 - type: Poweredlight + type: WallLight components: - - pos: 13.52327,-13.17637 + - pos: -38.5,10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 559 type: Poweredlight components: @@ -5873,19 +5798,12 @@ entities: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 560 - type: PoweredSmallLight + type: StoolBar components: - - rot: 1.5707963267948966 rad - pos: 11.041167,-29.44989 + - rot: -1.5707963267948966 rad + pos: -1.5,-3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 561 type: AirlockCommandGlassLocked components: @@ -6070,7 +5988,7 @@ entities: parent: 853 type: Transform - uid: 578 - type: TableMetal + type: Table components: - pos: -0.5,13.5 parent: 853 @@ -6140,10 +6058,10 @@ entities: ents: [] type: ContainerContainer - uid: 586 - type: StoolBar + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: -1.5,-4.5 + - rot: -1.5707963267948966 rad + pos: -35.5,-3.5 parent: 853 type: Transform - uid: 587 @@ -6949,14 +6867,14 @@ entities: ents: [] type: ContainerContainer - uid: 657 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -36.5,11.5 parent: 853 type: Transform - uid: 658 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -37.5,11.5 @@ -7021,18 +6939,14 @@ entities: parent: 853 type: Transform - uid: 665 - type: Poweredlight + type: WallLight components: - - pos: -38.50688,10.857263 + - rot: -1.5707963267948966 rad + pos: -34.5,9.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 666 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -40.5,10.5 @@ -7065,14 +6979,14 @@ entities: parent: 853 type: Transform - uid: 670 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 18.5,-18.5 parent: 853 type: Transform - uid: 671 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 17.5,-18.5 @@ -7086,7 +7000,7 @@ entities: parent: 853 type: Transform - uid: 673 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -41.5,9.5 @@ -7121,7 +7035,7 @@ entities: parent: 853 type: Transform - uid: 678 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -40.5,9.5 @@ -7156,7 +7070,7 @@ entities: parent: 853 type: Transform - uid: 683 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -39.5,9.5 @@ -7183,7 +7097,7 @@ entities: parent: 853 type: Transform - uid: 687 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -39.5,7.5 @@ -7220,14 +7134,14 @@ entities: parent: 853 type: Transform - uid: 693 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -41.5,7.5 parent: 853 type: Transform - uid: 694 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -40.5,7.5 @@ -7246,7 +7160,7 @@ entities: parent: 853 type: Transform - uid: 697 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -40.5,6.5 @@ -7290,7 +7204,7 @@ entities: - canCollide: False type: Physics - uid: 702 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -41.5,5.5 @@ -7319,7 +7233,7 @@ entities: parent: 853 type: Transform - uid: 706 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -40.5,5.5 @@ -7360,7 +7274,7 @@ entities: parent: 853 type: Transform - uid: 711 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -39.5,5.5 @@ -7381,7 +7295,7 @@ entities: parent: 853 type: Transform - uid: 714 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -39.5,3.5 @@ -7409,7 +7323,7 @@ entities: parent: 853 type: Transform - uid: 718 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -41.5,3.5 @@ -7444,7 +7358,7 @@ entities: parent: 853 type: Transform - uid: 723 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -40.5,3.5 @@ -7493,7 +7407,7 @@ entities: parent: 853 type: Transform - uid: 730 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -40.5,2.5 @@ -7528,7 +7442,7 @@ entities: parent: 853 type: Transform - uid: 735 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -40.5,1.5 @@ -7569,7 +7483,7 @@ entities: parent: 853 type: Transform - uid: 741 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -39.5,1.5 @@ -7619,49 +7533,49 @@ entities: parent: 853 type: Transform - uid: 747 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,0.5 parent: 853 type: Transform - uid: 748 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,-0.5 parent: 853 type: Transform - uid: 749 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,-1.5 parent: 853 type: Transform - uid: 750 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -37.5,-2.5 parent: 853 type: Transform - uid: 751 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,-2.5 parent: 853 type: Transform - uid: 752 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -39.5,-2.5 parent: 853 type: Transform - uid: 753 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -37.5,-4.5 @@ -7677,7 +7591,7 @@ entities: stash: !type:ContainerSlot {} type: ContainerContainer - uid: 755 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -39.5,-4.5 @@ -8264,8 +8178,6 @@ entities: - pos: -0.5,18.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 808 @@ -8315,7 +8227,7 @@ entities: ents: [] type: ContainerContainer - uid: 812 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,-4.5 @@ -14409,29 +14321,21 @@ entities: parent: 853 type: Transform - uid: 857 - type: Poweredlight + type: WallLight components: - - pos: 54.543198,-9.213088 + - rot: 3.141592653589793 rad + pos: -38.5,2.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 858 - type: Poweredlight + type: WallLight components: - - pos: 44.465073,-9.134963 + - rot: -1.5707963267948966 rad + pos: -35.5,0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 859 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,-5.5 @@ -14678,42 +14582,25 @@ entities: parent: 853 type: Transform - uid: 891 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 3.141592697301183 rad - pos: -12.5,-5 + - rot: -1.5707963267948966 rad + pos: 10.5,19.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 892 - type: Poweredlight + type: WallLight components: - - pos: -11.487365,5.8158755 + - rot: -1.5707963267948966 rad + pos: -35.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 893 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -13.5,-2 + - pos: -32.5,5.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 894 type: KitchenMicrowave components: @@ -14763,8 +14650,6 @@ entities: pos: -17.5,-9.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 900 @@ -14891,10 +14776,10 @@ entities: parent: 853 type: Transform - uid: 918 - type: WallSolid + type: WallLight components: - - rot: 4.371139006309477E-08 rad - pos: -15.5,-1.5 + - rot: 3.141592653589793 rad + pos: -30.5,3.5 parent: 853 type: Transform - uid: 919 @@ -15320,8 +15205,6 @@ entities: - pos: -11.5,-9.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 981 @@ -15366,8 +15249,6 @@ entities: pos: 0.5,23.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 986 @@ -15377,8 +15258,6 @@ entities: pos: 1.5,21.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 987 @@ -15434,8 +15313,6 @@ entities: - pos: -13.5,1.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 993 @@ -15775,28 +15652,19 @@ entities: ents: [] type: ContainerContainer - uid: 1035 - type: Poweredlight - components: - - pos: -32.48585,5.8534822 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1036 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: -10.9225445,7.479561 + pos: -29.5,9.5 + parent: 853 + type: Transform +- uid: 1036 + type: WallLight + components: + - rot: 3.141592653589793 rad + pos: -26.5,8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1037 type: SpawnPointSecurityOfficer components: @@ -15911,16 +15779,12 @@ entities: parent: 853 type: Transform - uid: 1052 - type: Poweredlight + type: WallLight components: - - pos: -11.519875,12.105981 + - rot: -1.5707963267948966 rad + pos: -23.5,8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1053 type: ReinforcedWindow components: @@ -15949,31 +15813,22 @@ entities: parent: 853 type: Transform - uid: 1057 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: -6.5,-26 + - rot: -1.5707963267948966 rad + pos: 5.5,16.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1058 type: VendingMachineSeeds components: - pos: -18.5,-2.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 1059 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,-6.5 @@ -15987,53 +15842,32 @@ entities: parent: 853 type: Transform - uid: 1061 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 2.1104045,7.4564466 + - rot: -1.5707963267948966 rad + pos: -22.5,2.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1062 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: -9.922553,13.456606 + - rot: 3.141592653589793 rad + pos: -20.5,3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1063 - type: Poweredlight + type: WallLight components: - - pos: -15.539971,-17.154892 + - rot: -1.5707963267948966 rad + pos: -22.5,-0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1064 - type: PoweredSmallLight + type: WallLight components: - - pos: 40.98358,13.845015 + - pos: -18.5,5.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1065 type: ResearchAndDevelopmentServer components: @@ -16044,103 +15878,60 @@ entities: - points: 136000 type: ResearchServer - uid: 1066 - type: PoweredSmallLight + type: SmallLight components: - - rot: 4.71238902409608 rad - pos: -7,-23.5 + - rot: 3.141592653589793 rad + pos: -31.5,7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1067 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: -17.87964,-21.491213 + pos: -20.5,0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1068 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -1.5,-21 + - rot: 1.5707963267948966 rad + pos: -25.5,-0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1069 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: -20.870539,0.49653578 + pos: -25.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1070 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -9.5,-21 + - rot: -1.5707963267948966 rad + pos: -21.5,-6.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1071 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: -5.89616,-14.473355 + - pos: -18.5,-7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1072 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 2.0898275,-9.5469675 + - rot: 3.141592653589793 rad + pos: -20.5,-2.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1073 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -1.5,-18 + - rot: 3.141592653589793 rad + pos: -24.5,-8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1074 type: Paper components: @@ -16186,49 +15977,49 @@ entities: parent: 853 type: Transform - uid: 1081 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -8.5,-30.5 parent: 853 type: Transform - uid: 1082 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -6.5,-30.5 parent: 853 type: Transform - uid: 1083 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -7.5,-30.5 parent: 853 type: Transform - uid: 1084 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -6.5,-29.5 parent: 853 type: Transform - uid: 1085 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -9.5,-30.5 parent: 853 type: Transform - uid: 1086 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -10.5,-30.5 parent: 853 type: Transform - uid: 1087 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -10.5,-29.5 @@ -16292,17 +16083,12 @@ entities: - location: dorms type: WarpPoint - uid: 1096 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 19.913452,-17.520119 + - rot: 1.5707963267948966 rad + pos: -13.5,15.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1097 type: ChairOfficeLight components: @@ -16338,7 +16124,7 @@ entities: parent: 853 type: Transform - uid: 1102 - type: LowWall + type: Grille components: - pos: 16.5,-3.5 parent: 853 @@ -16492,53 +16278,32 @@ entities: parent: 853 type: Transform - uid: 1123 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 23.5,-8 + - pos: -8.5,22.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1124 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 19.923454,-11.570569 + - rot: 1.5707963267948966 rad + pos: -2.5,24.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1125 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 5.9039526,-17.513905 + - rot: 1.5707963267948966 rad + pos: -2.5,30.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1126 - type: Poweredlight + type: WallLight components: - rot: -1.5707963267948966 rad - pos: 24.894157,-14.48887 + pos: 9.5,30.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1127 type: Window components: @@ -16561,14 +16326,14 @@ entities: parent: 853 type: Transform - uid: 1130 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 17.5,-12.5 parent: 853 type: Transform - uid: 1131 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 16.5,-12.5 @@ -16589,7 +16354,7 @@ entities: - canCollide: False type: Physics - uid: 1134 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,-7.5 @@ -16624,8 +16389,6 @@ entities: pos: 13.5,-11.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 1139 @@ -16731,8 +16494,6 @@ entities: pos: 19.5,-4.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 1152 @@ -16885,16 +16646,11 @@ entities: ents: [] type: ContainerContainer - uid: 1168 - type: Poweredlight + type: WallLight components: - - pos: -8.48515,5.8506384 + - pos: 12.5,26.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1169 type: KitchenReagentGrinder components: @@ -16925,22 +16681,18 @@ entities: parent: 853 type: Transform - uid: 1173 - type: LowWall + type: Grille components: - pos: -1.5,12.5 parent: 853 type: Transform - uid: 1174 - type: Poweredlight + type: WallLight components: - - pos: -3.5686207,5.8193884 + - rot: 3.141592653589793 rad + pos: 5.5,28.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1175 type: CableApcExtension components: @@ -17002,14 +16754,14 @@ entities: parent: 853 type: Transform - uid: 1183 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -38.5,-8.5 parent: 853 type: Transform - uid: 1184 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -37.5,-8.5 @@ -17042,40 +16794,25 @@ entities: parent: 853 type: Transform - uid: 1189 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: -13.905625,16.18277 + - rot: 3.141592653589793 rad + pos: 1.5,28.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1190 type: EmergencyLight components: - - rot: 4.71238902409608 rad - pos: -35.166924,-3.5 + - pos: -13.5,-17.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 1191 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -16.087059,-1.5190892 + - rot: 1.5707963267948966 rad + pos: 2.5,23.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1192 type: SignShipDock components: @@ -17098,44 +16835,32 @@ entities: parent: 853 type: Transform - uid: 1195 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -19.5,2.5 parent: 853 type: Transform - uid: 1196 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -18.5,2.5 parent: 853 type: Transform - uid: 1197 - type: Poweredlight + type: EmergencyLight components: - - pos: -18.497206,5.8113365 + - rot: 1.5707963267948966 rad + pos: -20.5,-0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1198 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: -29.5,15 + - pos: 0.5,14.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1199 type: TableWood components: @@ -17149,33 +16874,18 @@ entities: parent: 853 type: Transform - uid: 1201 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 1.5707963705062866 rad - pos: -34,-0.5 + - pos: -2.5,14.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1202 - type: PoweredSmallLight + type: SmallLight components: - - rot: 4.71238902409608 rad - pos: -18,-4.5 + - rot: 3.141592653589793 rad + pos: -0.5,-11.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1203 type: Pen components: @@ -17190,16 +16900,12 @@ entities: parent: 853 type: Transform - uid: 1205 - type: Poweredlight + type: WallLight components: - - pos: -5.502577,17.78978 + - rot: -1.5707963267948966 rad + pos: 4.5,23.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1206 type: Table components: @@ -17237,19 +16943,12 @@ entities: - canCollide: False type: Physics - uid: 1211 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 3.141592697301183 rad - pos: -29.5,-9 + - rot: -1.5707963267948966 rad + pos: -7.5,7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1212 type: TableReinforced components: @@ -17258,17 +16957,12 @@ entities: parent: 853 type: Transform - uid: 1213 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -22.116953,2.4939203 + - rot: 3.141592653589793 rad + pos: 8.5,16.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1214 type: CrowbarRed components: @@ -17283,52 +16977,32 @@ entities: parent: 853 type: Transform - uid: 1216 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -20.5,3 + - rot: 3.141592653589793 rad + pos: 5.5,16.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1217 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -30.5,3 + - rot: 3.141592653589793 rad + pos: 1.5,16.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1218 - type: Poweredlight + type: WallLight components: - - pos: -27.497717,11.849479 + - pos: -1.5,18.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1219 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -34.08711,9.508544 + - rot: 1.5707963267948966 rad + pos: 6.5,9.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1220 type: LockerWeldingSupplies components: @@ -17394,31 +17068,19 @@ entities: ents: [] type: ContainerContainer - uid: 1226 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: -29.906116,9.430419 + - rot: -1.5707963267948966 rad + pos: 10.5,9.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1227 - type: PoweredSmallLight + type: SmallLight components: - - rot: 4.71238902409608 rad - pos: -19,9.5 + - rot: -1.5707963267948966 rad + pos: 23.5,-0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1228 type: Table components: @@ -17434,47 +17096,25 @@ entities: parent: 853 type: Transform - uid: 1230 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 3.141592697301183 rad - pos: -14.5,-16 + - rot: 3.141592653589793 rad + pos: 15.5,3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1231 - type: PoweredSmallLight + type: SmallLight components: - - rot: 4.71238902409608 rad - pos: -7,-12.5 + - rot: 1.5707963267948966 rad + pos: 26.5,11.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1232 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.71238902409608 rad - pos: -11,-10.5 + - pos: 19.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1233 type: ClosetToolFilled components: @@ -17489,17 +17129,12 @@ entities: ents: [] type: ContainerContainer - uid: 1234 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: 17.115456,-20.488289 + pos: 12.5,10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1235 type: VendingMachineCola components: @@ -17507,8 +17142,6 @@ entities: pos: -34.5,2.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 1236 @@ -17542,17 +17175,12 @@ entities: - startingCharge: 11999.417 type: Battery - uid: 1240 - type: Poweredlight + type: WallLight components: - rot: -1.5707963267948966 rad - pos: -23.089119,8.505429 + pos: 4.5,12.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1241 type: Table components: @@ -17568,14 +17196,14 @@ entities: parent: 853 type: Transform - uid: 1243 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -36.5,-8.5 parent: 853 type: Transform - uid: 1244 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -35.5,-8.5 @@ -17639,75 +17267,39 @@ entities: parent: 853 type: Transform - uid: 1252 - type: PoweredSmallLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: -19,16.5 + - rot: 1.5707963267948966 rad + pos: 11.5,-29.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1253 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: -14.5,26 + - rot: 1.5707963267948966 rad + pos: -2.5,26.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1254 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 1.5707963705062866 rad - pos: -19,22.5 + - rot: 3.141592653589793 rad + pos: 32.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1255 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 1.5707963705062866 rad - pos: -18,9.5 + - pos: 26.5,-1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1256 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 3.141592697301183 rad - pos: -0.5,-12 + - rot: -1.5707963267948966 rad + pos: 5.5,-15.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1257 type: Paper components: @@ -17725,28 +17317,18 @@ entities: - canCollide: False type: Physics - uid: 1259 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -35.07844,-4.406664 + - rot: 1.5707963267948966 rad + pos: 2.5,7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1260 - type: Poweredlight + type: WallLight components: - - pos: 1.5033649,0.8428016 + - pos: 15.5,12.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1261 type: ReinforcedWindow components: @@ -17767,8 +17349,6 @@ entities: pos: 31.5,-0.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 1264 @@ -17786,53 +17366,33 @@ entities: parent: 853 type: Transform - uid: 1266 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: 6.1210775,-4.523888 + pos: 18.5,13.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1267 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -0.5,-5 + - rot: -1.5707963267948966 rad + pos: 24.5,11.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1268 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 4.8710775,2.273314 + - rot: 1.5707963267948966 rad + pos: 18.5,8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1269 - type: Poweredlight + type: WallLight components: - rot: -1.5707963267948966 rad - pos: 4.8977103,23.496256 + pos: 16.5,7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1270 type: SignDirectionalSci components: @@ -17841,34 +17401,25 @@ entities: parent: 853 type: Transform - uid: 1271 - type: LowWall + type: Grille components: - pos: -1.5,14.5 parent: 853 type: Transform - uid: 1272 - type: Poweredlight + type: WallLight components: - - pos: -8.486245,22.842363 + - rot: 3.141592653589793 rad + pos: 18.5,3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1273 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -1.5,10 + - rot: 3.141592653589793 rad + pos: 13.5,3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1274 type: ReinforcedWindow components: @@ -17894,55 +17445,29 @@ entities: parent: 853 type: Transform - uid: 1278 - type: Poweredlight + type: WallLight components: - - rot: 4.371139006309477E-08 rad - pos: -1.5,19 + - pos: 12.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1279 - type: Poweredlight + type: WallLight components: - - rot: 4.71238902409608 rad - pos: -5,16.5 + - pos: 15.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1280 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: -1.5707963267948966 rad - pos: -11.046864,19.455282 + - pos: 10.5,-22.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1281 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 2.1164603,23.496256 + - pos: 18.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1282 type: Carpet components: @@ -17972,19 +17497,11 @@ entities: parent: 853 type: Transform - uid: 1286 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: -7.5,26 + - pos: 6.5,-23.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1287 type: AirlockMaintCommonLocked components: @@ -17997,151 +17514,87 @@ entities: ents: [] type: ContainerContainer - uid: 1288 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 1.5707963705062866 rad - pos: -4,17.5 + - pos: -11.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1289 - type: PoweredSmallLight - components: - - pos: 12.520373,24.758696 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1290 - type: Poweredlight - components: - - rot: 3.141592653589793 rad - pos: 0.4871831,3.0057735 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1291 - type: Poweredlight + type: EmergencyLight components: - rot: -1.5707963267948966 rad - pos: 10.845088,9.476223 + pos: -22.5,-1.5 + parent: 853 + type: Transform +- uid: 1290 + type: WallLight + components: + - rot: 3.141592653589793 rad + pos: 23.5,3.5 + parent: 853 + type: Transform +- uid: 1291 + type: WallLight + components: + - rot: -1.5707963267948966 rad + pos: 19.5,-0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1292 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 5.5,28 + - rot: 3.141592653589793 rad + pos: 27.5,0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1293 - type: Poweredlight - components: - - rot: 3.141592697301183 rad - pos: 1.5,28 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1294 - type: Poweredlight - components: - - rot: 4.71238902409608 rad - pos: 10,25.5 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1295 - type: Poweredlight - components: - - pos: 8.501338,21.797794 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1296 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: 6.157588,9.523098 + pos: 29.5,-2.5 + parent: 853 + type: Transform +- uid: 1294 + type: WallLight + components: + - rot: 1.5707963267948966 rad + pos: 31.5,-0.5 + parent: 853 + type: Transform +- uid: 1295 + type: WallLight + components: + - rot: 3.141592653589793 rad + pos: 31.5,2.5 + parent: 853 + type: Transform +- uid: 1296 + type: WallLight + components: + - rot: 1.5707963267948966 rad + pos: 37.5,2.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1297 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 5.5,16 + - pos: 35.5,6.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1298 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 1.5,16 + - rot: 3.141592653589793 rad + pos: 36.5,8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1299 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 8.5,16 + - rot: 3.141592653589793 rad + pos: 30.5,8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1300 type: WallSolid components: @@ -18157,18 +17610,12 @@ entities: parent: 853 type: Transform - uid: 1302 - type: PoweredSmallLight + type: EmergencyLight components: - - pos: 25.501043,-1.1861185 + - rot: 1.5707963267948966 rad + pos: 7.5,-20.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1303 type: WallSolid components: @@ -18198,93 +17645,52 @@ entities: parent: 853 type: Transform - uid: 1307 - type: PoweredSmallLight + type: EmergencyLight components: - - pos: 16.5,16 + - rot: 1.5707963267948966 rad + pos: 18.5,9.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1308 - type: PoweredSmallLight + type: SmallLight components: - rot: 1.5707963267948966 rad - pos: 12,18.5 + pos: 12.5,18.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1309 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: 8.5,15 + - pos: -39.5,10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1310 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: 47.090073,-4.4708805 + pos: 30.5,12.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1311 - type: Poweredlight + type: WallLight components: - - pos: 12.508076,1.8582891 + - rot: -1.5707963267948966 rad + pos: 35.5,-2.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1312 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 13.5,3 + - rot: 3.141592653589793 rad + pos: 38.5,-1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1313 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 18.5,3 + - pos: 23.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1314 type: Poweredlight components: @@ -18298,63 +17704,40 @@ entities: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 1315 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 18.098747,8.494373 + - rot: 3.141592653589793 rad + pos: 23.5,-7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1316 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963705062866 rad - pos: 12,10.5 + - rot: -1.5707963267948966 rad + pos: 19.5,-8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1317 - type: Poweredlight + type: WallLight components: - - pos: 15.493641,1.8426641 + - rot: -1.5707963267948966 rad + pos: 19.5,-11.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1318 - type: Poweredlight + type: WallLight components: - - pos: 15.520623,12.86064 + - rot: -1.5707963267948966 rad + pos: 24.5,-14.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1319 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 1.1155372,-17.513905 + - rot: -1.5707963267948966 rad + pos: 19.5,-17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1320 type: WallSolid components: @@ -18394,27 +17777,18 @@ entities: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 1324 - type: Poweredlight + type: WallLight components: - - pos: -1.4899101,-13.17648 + - rot: 1.5707963267948966 rad + pos: 17.5,-20.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1325 - type: Poweredlight + type: WallLight components: - - pos: -9.521995,-17.191471 + - pos: 13.5,-13.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1326 type: SignCargo components: @@ -18436,17 +17810,12 @@ entities: parent: 853 type: Transform - uid: 1329 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 2.0898275,-4.523888 + - rot: 3.141592653589793 rad + pos: 9.5,-16.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1330 type: SignDirectionalMed components: @@ -18462,53 +17831,33 @@ entities: parent: 853 type: Transform - uid: 1332 - type: Poweredlight - components: - - rot: 1.5707963267948966 rad - pos: 7.1310654,-14.473245 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1333 - type: Poweredlight - components: - - rot: 3.141592697301183 rad - pos: 6.5,-12 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1334 - type: Poweredlight - components: - - rot: 3.141592697301183 rad - pos: 9.5,-17 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1335 - type: Poweredlight + type: WallLight components: - rot: -1.5707963267948966 rad - pos: 19.90783,-8.476819 + pos: 5.5,-17.5 + parent: 853 + type: Transform +- uid: 1333 + type: WallLight + components: + - rot: 1.5707963267948966 rad + pos: 7.5,-14.5 + parent: 853 + type: Transform +- uid: 1334 + type: WallLight + components: + - rot: 3.141592653589793 rad + pos: 6.5,-11.5 + parent: 853 + type: Transform +- uid: 1335 + type: WallLight + components: + - rot: 1.5707963267948966 rad + pos: 1.5,-17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1336 type: WallReinforced components: @@ -18548,54 +17897,32 @@ entities: parent: 853 type: Transform - uid: 1341 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 6.1367025,1.6240516 + - rot: 3.141592653589793 rad + pos: -1.5,-17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1342 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 18.088957,13.54814 + - rot: 3.141592653589793 rad + pos: -1.5,-20.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1343 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 12.518894,-11 + - rot: -1.5707963267948966 rad + pos: -2.5,-23.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1344 - type: PoweredSmallLight + type: EmergencyLight components: - - pos: 22.445484,-9.293987 + - pos: -24.5,11.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1345 type: WallSolid components: @@ -18604,43 +17931,26 @@ entities: parent: 853 type: Transform - uid: 1346 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 51.933823,-4.5333805 + - rot: 1.5707963267948966 rad + pos: 2.5,-25.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1347 - type: Poweredlight + type: WallLight + components: + - rot: 1.5707963267948966 rad + pos: 6.5,-25.5 + parent: 853 + type: Transform +- uid: 1348 + type: StoolBar components: - rot: -1.5707963267948966 rad - pos: 12.937156,-3.5445666 + pos: -1.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1348 - type: PoweredSmallLight - components: - - rot: 4.371139006309477E-08 rad - pos: 9.5,-18 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1349 type: WallSolid components: @@ -18670,19 +17980,11 @@ entities: parent: 853 type: Transform - uid: 1353 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: 12.5,-19 + - pos: 12.5,-29.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1354 type: WallSolid components: @@ -18691,33 +17993,19 @@ entities: parent: 853 type: Transform - uid: 1355 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 3.141592697301183 rad - pos: 25.5,-19 + - rot: 1.5707963267948966 rad + pos: 2.5,8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1356 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.71238902409608 rad - pos: 28,-15.5 + - rot: 1.5707963267948966 rad + pos: 7.5,-15.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1357 type: Catwalk components: @@ -18754,19 +18042,12 @@ entities: parent: 853 type: Transform - uid: 1362 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.71238902409608 rad - pos: 28,-10.5 + - rot: 1.5707963267948966 rad + pos: 6.5,10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1363 type: Window components: @@ -18775,110 +18056,59 @@ entities: parent: 853 type: Transform - uid: 1364 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.71238902409608 rad - pos: 24,0.5 + - rot: 3.141592653589793 rad + pos: -2.5,28.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1365 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 1.5707963705062866 rad - pos: 26,-4.5 + - pos: -12.5,5.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1366 - type: PoweredSmallLight + type: EmergencyLight components: - - pos: 35.514977,-6.262737 + - rot: 1.5707963267948966 rad + pos: -13.5,7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1367 - type: PoweredSmallLight + type: WallSolid components: - - rot: 1.5707963267948966 rad - pos: -30.97177,-5.531664 + - pos: 10.5,-21.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1368 - type: PoweredSmallLight - components: - - rot: 1.5707963705062866 rad - pos: 26,11.5 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1369 - type: Poweredlight - components: - - pos: 28.505056,6.8201885 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1370 - type: PoweredSmallLight - components: - - pos: 30.499353,-6.200237 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 1371 - type: Poweredlight + type: EmergencyLight components: - rot: 1.5707963267948966 rad - pos: -25.917414,-0.5190892 + pos: 12.5,9.5 + parent: 853 + type: Transform +- uid: 1369 + type: WallLight + components: + - rot: -1.5707963267948966 rad + pos: 4.5,-28.5 + parent: 853 + type: Transform +- uid: 1370 + type: Stool + components: + - rot: -1.5707963267948966 rad + pos: -22.5,-6.5 + parent: 853 + type: Transform +- uid: 1371 + type: WallLight + components: + - rot: -1.5707963267948966 rad + pos: 9.5,-29.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1372 type: SignEngineering components: @@ -18887,17 +18117,12 @@ entities: parent: 853 type: Transform - uid: 1373 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 37.0966,2.484137 + - rot: -1.5707963267948966 rad + pos: 12.5,-25.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1374 type: Poweredlight components: @@ -18911,41 +18136,25 @@ entities: light_bulb: !type:ContainerSlot {} type: ContainerContainer - uid: 1375 - type: Poweredlight + type: WallLight components: - - rot: 4.371139006309477E-08 rad - pos: 35.5,7 + - pos: 7.5,-22.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1376 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963705062866 rad - pos: 29,-2.5 + - rot: 1.5707963267948966 rad + pos: 2.5,-9.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1377 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 24.923923,11.532515 + - rot: 1.5707963267948966 rad + pos: 6.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1378 type: WallSolid components: @@ -18961,54 +18170,32 @@ entities: parent: 853 type: Transform - uid: 1380 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: 30.104717,12.563765 + pos: 2.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1381 - type: Poweredlight + type: WallLight components: - - pos: 46.516445,4.843512 + - rot: -1.5707963267948966 rad + pos: 0.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1382 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 36.5,8 + - rot: 3.141592653589793 rad + pos: 0.5,3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1383 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.71238902409608 rad - pos: 44,-1.5 + - pos: -4.5,-8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1384 type: CableApcExtension components: @@ -19027,40 +18214,25 @@ entities: parent: 853 type: Transform - uid: 1386 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 30.5,8 + - rot: -1.5707963267948966 rad + pos: 4.5,2.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1387 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: 38.5,-2 + - rot: 1.5707963267948966 rad + pos: 6.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1388 - type: PoweredlightEmpty + type: WallLight components: - - pos: 13.536872,-7.156335 + - pos: -2.5,8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1389 type: SignDirectionalEng components: @@ -19121,7 +18293,7 @@ entities: ents: [] type: ContainerContainer - uid: 1397 - type: LowWall + type: Grille components: - pos: 3.5,27.5 parent: 853 @@ -19317,16 +18489,12 @@ entities: parent: 853 type: Transform - uid: 1426 - type: Poweredlight + type: WallLight components: - - pos: -1.2113109,11.1277275 + - rot: 3.141592653589793 rad + pos: -2.5,10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1427 type: AirlockSecurityGlassLocked components: @@ -19338,32 +18506,18 @@ entities: ents: [] type: ContainerContainer - uid: 1428 - type: PoweredSmallLight + type: EmergencyLight components: - - pos: -0.50818586,15.0808525 + - pos: -13.5,-10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1429 - type: PoweredSmallLight + type: EmergencyLight components: - rot: -1.5707963267948966 rad - pos: 1.1636891,13.8464775 + pos: 9.5,24.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1430 type: WallReinforced components: @@ -19377,7 +18531,7 @@ entities: parent: 853 type: Transform - uid: 1432 - type: LowWall + type: Grille components: - pos: -13.5,9.5 parent: 853 @@ -19684,7 +18838,7 @@ entities: parent: 853 type: Transform - uid: 1476 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -27.5,6.5 @@ -19697,7 +18851,7 @@ entities: parent: 853 type: Transform - uid: 1478 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -29.5,6.5 @@ -19838,21 +18992,21 @@ entities: parent: 853 type: Transform - uid: 1497 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 11.5,-16.5 parent: 853 type: Transform - uid: 1498 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 11.5,-13.5 parent: 853 type: Transform - uid: 1499 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 7.5,-12.5 @@ -19877,14 +19031,14 @@ entities: parent: 853 type: Transform - uid: 1502 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 20.5,-12.5 parent: 853 type: Transform - uid: 1503 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 20.5,-15.5 @@ -20062,18 +19216,11 @@ entities: parent: 853 type: Transform - uid: 1529 - type: PoweredSmallLight + type: EmergencyLight components: - - pos: 14.5,22 + - pos: -10.5,-17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1530 type: ChairOfficeLight components: @@ -20094,7 +19241,7 @@ entities: parent: 853 type: Transform - uid: 1533 - type: LowWall + type: Grille components: - pos: 15.5,22.5 parent: 853 @@ -20133,8 +19280,6 @@ entities: pos: 31.5,0.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 1539 @@ -20701,21 +19846,21 @@ entities: parent: 853 type: Transform - uid: 1617 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 40.5,1.5 parent: 853 type: Transform - uid: 1618 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 39.5,1.5 parent: 853 type: Transform - uid: 1619 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 36.5,-0.5 @@ -20734,33 +19879,19 @@ entities: ents: [] type: ContainerContainer - uid: 1621 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: -12.5,-6 + - rot: 1.5707963267948966 rad + pos: 30.5,9.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1622 - type: PoweredSmallLight + type: EmergencyLight components: - - rot: 4.371139006309477E-08 rad - pos: -25.5,-10 + - rot: 1.5707963267948966 rad + pos: 47.5,-3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1623 type: WallSolid components: @@ -20818,14 +19949,14 @@ entities: parent: 853 type: Transform - uid: 1631 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,1.5 parent: 853 type: Transform - uid: 1632 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,2.5 @@ -20923,7 +20054,7 @@ entities: parent: 853 type: Transform - uid: 1646 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 37.5,1.5 @@ -20937,7 +20068,7 @@ entities: parent: 853 type: Transform - uid: 1648 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,3.5 @@ -21290,7 +20421,7 @@ entities: parent: 853 type: Transform - uid: 1704 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,0.5 @@ -21430,14 +20561,14 @@ entities: parent: 853 type: Transform - uid: 1726 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 34.5,7.5 parent: 853 type: Transform - uid: 1727 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 32.5,7.5 @@ -21507,84 +20638,84 @@ entities: parent: 853 type: Transform - uid: 1737 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 32.5,1.5 parent: 853 type: Transform - uid: 1738 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 34.5,1.5 parent: 853 type: Transform - uid: 1739 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 30.5,4.5 parent: 853 type: Transform - uid: 1740 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 30.5,14.5 parent: 853 type: Transform - uid: 1741 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 30.5,15.5 parent: 853 type: Transform - uid: 1742 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 31.5,15.5 parent: 853 type: Transform - uid: 1743 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 32.5,15.5 parent: 853 type: Transform - uid: 1744 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 33.5,15.5 parent: 853 type: Transform - uid: 1745 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 34.5,15.5 parent: 853 type: Transform - uid: 1746 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 35.5,15.5 parent: 853 type: Transform - uid: 1747 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 36.5,15.5 parent: 853 type: Transform - uid: 1748 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 36.5,14.5 @@ -21625,14 +20756,14 @@ entities: parent: 853 type: Transform - uid: 1754 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 21.5,14.5 parent: 853 type: Transform - uid: 1755 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 23.5,14.5 @@ -21645,7 +20776,7 @@ entities: parent: 853 type: Transform - uid: 1757 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 19.5,14.5 @@ -21778,28 +20909,28 @@ entities: parent: 853 type: Transform - uid: 1776 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 19.5,6.5 parent: 853 type: Transform - uid: 1777 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 20.5,6.5 parent: 853 type: Transform - uid: 1778 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 21.5,6.5 parent: 853 type: Transform - uid: 1779 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 22.5,6.5 @@ -22080,7 +21211,7 @@ entities: parent: 853 type: Transform - uid: 1820 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 8.5,6.5 @@ -22210,17 +21341,11 @@ entities: parent: 853 type: Transform - uid: 1839 - type: Poweredlight + type: WallLight components: - - rot: 3.141592697301183 rad - pos: -24.5,-9 + - pos: -4.5,14.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 1840 type: WallSolid components: @@ -22329,8 +21454,7 @@ entities: - uid: 1855 type: EmergencyLight components: - - rot: -1.5707963267948966 rad - pos: 9.693537,24.5 + - pos: 44.5,9.5 parent: 853 type: Transform - uid: 1856 @@ -22557,168 +21681,168 @@ entities: parent: 853 type: Transform - uid: 1887 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 3.5,22.5 parent: 853 type: Transform - uid: 1888 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -1.5,27.5 parent: 853 type: Transform - uid: 1889 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -0.5,27.5 parent: 853 type: Transform - uid: 1890 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -3.5,29.5 parent: 853 type: Transform - uid: 1891 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 10.5,29.5 parent: 853 type: Transform - uid: 1892 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 9.5,31.5 parent: 853 type: Transform - uid: 1893 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 9.5,32.5 parent: 853 type: Transform - uid: 1894 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 8.5,32.5 parent: 853 type: Transform - uid: 1895 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 8.5,33.5 parent: 853 type: Transform - uid: 1896 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 7.5,33.5 parent: 853 type: Transform - uid: 1897 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 6.5,33.5 parent: 853 type: Transform - uid: 1898 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 5.5,33.5 parent: 853 type: Transform - uid: 1899 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 4.5,33.5 parent: 853 type: Transform - uid: 1900 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 3.5,33.5 parent: 853 type: Transform - uid: 1901 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 2.5,33.5 parent: 853 type: Transform - uid: 1902 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 1.5,33.5 parent: 853 type: Transform - uid: 1903 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 0.5,33.5 parent: 853 type: Transform - uid: 1904 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -0.5,33.5 parent: 853 type: Transform - uid: 1905 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -1.5,33.5 parent: 853 type: Transform - uid: 1906 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -1.5,32.5 parent: 853 type: Transform - uid: 1907 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -2.5,31.5 parent: 853 type: Transform - uid: 1908 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -2.5,32.5 parent: 853 type: Transform - uid: 1909 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 6.5,19.5 parent: 853 type: Transform - uid: 1910 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 6.5,18.5 @@ -22809,7 +21933,7 @@ entities: parent: 853 type: Transform - uid: 1923 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -7.5,18.5 @@ -23192,10 +22316,10 @@ entities: parent: 853 type: Transform - uid: 1977 - type: EmergencyLight + type: Stool components: - rot: 1.5707963267948966 rad - pos: -13.770238,7.833312 + pos: -24.5,-2.5 parent: 853 type: Transform - uid: 1978 @@ -23272,7 +22396,7 @@ entities: parent: 853 type: Transform - uid: 1988 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -10.5,14.5 @@ -23456,7 +22580,7 @@ entities: ents: [] type: ContainerContainer - uid: 2015 - type: LowWall + type: Grille components: - pos: -7.5,9.5 parent: 853 @@ -23572,9 +22696,9 @@ entities: parent: 853 type: Transform - uid: 2031 - type: EmergencyLight + type: SmallLight components: - - pos: 12.5,-29 + - pos: -29.5,14.5 parent: 853 type: Transform - uid: 2032 @@ -23648,9 +22772,9 @@ entities: parent: 853 type: Transform - uid: 2039 - type: WallSolid + type: SmallLight components: - - pos: 10.5,-21.5 + - pos: -23.5,20.5 parent: 853 type: Transform - uid: 2040 @@ -23943,7 +23067,7 @@ entities: parent: 853 type: Transform - uid: 2083 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -28.5,6.5 @@ -24159,7 +23283,7 @@ entities: parent: 853 type: Transform - uid: 2114 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -25.5,9.5 @@ -24191,7 +23315,7 @@ entities: parent: 853 type: Transform - uid: 2119 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 14.5,8.5 @@ -24295,7 +23419,7 @@ entities: parent: 853 type: Transform - uid: 2134 - type: LowWall + type: Grille components: - pos: 13.5,-1.5 parent: 853 @@ -24504,21 +23628,21 @@ entities: parent: 853 type: Transform - uid: 2161 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 5.5,-8.5 parent: 853 type: Transform - uid: 2162 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 5.5,-9.5 parent: 853 type: Transform - uid: 2163 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 5.5,-10.5 @@ -24565,77 +23689,77 @@ entities: - canCollide: False type: Physics - uid: 2168 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 11.5,2.5 parent: 853 type: Transform - uid: 2169 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 10.5,2.5 parent: 853 type: Transform - uid: 2170 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 9.5,2.5 parent: 853 type: Transform - uid: 2171 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 8.5,2.5 parent: 853 type: Transform - uid: 2172 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 7.5,2.5 parent: 853 type: Transform - uid: 2173 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 6.5,-6.5 parent: 853 type: Transform - uid: 2174 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 9.5,-6.5 parent: 853 type: Transform - uid: 2175 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 8.5,-6.5 parent: 853 type: Transform - uid: 2176 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 13.5,-5.5 parent: 853 type: Transform - uid: 2177 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 13.5,-4.5 parent: 853 type: Transform - uid: 2178 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 12.5,-6.5 @@ -24961,35 +24085,35 @@ entities: parent: 853 type: Transform - uid: 2224 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 20.5,-14.5 parent: 853 type: Transform - uid: 2225 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 20.5,-5.5 parent: 853 type: Transform - uid: 2226 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 11.5,-14.5 parent: 853 type: Transform - uid: 2227 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 11.5,-15.5 parent: 853 type: Transform - uid: 2228 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 9.5,-12.5 @@ -25513,21 +24637,21 @@ entities: parent: 853 type: Transform - uid: 2302 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -2.5,-18.5 parent: 853 type: Transform - uid: 2303 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -4.5,-18.5 parent: 853 type: Transform - uid: 2304 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 0.5,-16.5 @@ -25576,7 +24700,7 @@ entities: parent: 853 type: Transform - uid: 2311 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -4.5,-21.5 @@ -25674,14 +24798,14 @@ entities: parent: 853 type: Transform - uid: 2325 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -2.5,-21.5 parent: 853 type: Transform - uid: 2326 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: -5.5,-21.5 @@ -25866,13 +24990,13 @@ entities: parent: 853 type: Transform - uid: 2353 - type: LowWall + type: Grille components: - pos: 16.5,22.5 parent: 853 type: Transform - uid: 2354 - type: LowWall + type: Grille components: - pos: 17.5,22.5 parent: 853 @@ -26011,13 +25135,13 @@ entities: parent: 853 type: Transform - uid: 2374 - type: LowWall + type: Grille components: - pos: 17.5,21.5 parent: 853 type: Transform - uid: 2375 - type: LowWall + type: Grille components: - pos: 17.5,20.5 parent: 853 @@ -26083,8 +25207,6 @@ entities: pos: 5.5,-13.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 2384 @@ -26296,7 +25418,7 @@ entities: PumpBarrel-chamber-container: !type:ContainerSlot {} type: ContainerContainer - uid: 2412 - type: LowWall + type: Grille components: - pos: 5.5,-26.5 parent: 853 @@ -26414,7 +25536,7 @@ entities: ents: [] type: ContainerContainer - uid: 2426 - type: LowWall + type: Grille components: - pos: 5.5,-27.5 parent: 853 @@ -26486,8 +25608,6 @@ entities: pos: 29.5,6.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 2436 @@ -26762,10 +25882,9 @@ entities: ReagentDispenser-reagentContainerContainer: !type:ContainerSlot {} type: ContainerContainer - uid: 2474 - type: StoolBar + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -1.5,-3.5 + - pos: -21.5,17.5 parent: 853 type: Transform - uid: 2475 @@ -27765,19 +26884,12 @@ entities: - canCollide: False type: Physics - uid: 2583 - type: PoweredSmallLight + type: SmallLight components: - rot: 1.5707963267948966 rad - pos: -14.082738,8.770812 + pos: -26.5,17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 2584 type: CableApcExtension components: @@ -40351,19 +39463,12 @@ entities: parent: 853 type: Transform - uid: 3878 - type: PoweredSmallLight + type: SmallLight components: - rot: 1.5707963267948966 rad - pos: -15.015614,20.502157 + pos: -18.5,16.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 3879 type: CableApcExtension components: @@ -40405,27 +39510,19 @@ entities: ents: [] type: ContainerContainer - uid: 3883 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: 44.486908,10 + - rot: 1.5707963267948966 rad + pos: -18.5,22.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3884 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: 47.22923,-3 + - rot: 1.5707963267948966 rad + pos: -17.5,9.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3885 type: EmergencyLight components: @@ -40438,203 +39535,122 @@ entities: - startingCharge: 30000 type: Battery - uid: 3886 - type: EmergencyLight + type: SmallLight components: - - rot: 3.141592697301183 rad - pos: 31.467993,-4.5 + - rot: -1.5707963267948966 rad + pos: -19.5,9.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3887 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: 30.278831,9.5 + - rot: 1.5707963267948966 rad + pos: -13.5,8.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3888 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: 18.260162,9.5 + - rot: 3.141592653589793 rad + pos: -15.5,16.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3889 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: 26.46292,-1 + - rot: 1.5707963267948966 rad + pos: -14.5,20.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3890 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: 17.399544,2 + - rot: -1.5707963267948966 rad + pos: -11.5,19.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3891 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: 7.2721233,-15.5 + - pos: -14.5,25.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3892 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: 7.3033733,-20.5 + - pos: -7.5,25.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3893 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -10.487591,2 + - rot: 3.141592653589793 rad + pos: -1.5,20.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3894 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -2.7508366,15 + - pos: 25.5,-1.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3895 - type: EmergencyLight + type: SmallLight components: - - rot: 4.71238902409608 rad - pos: 5.701264,16.5 + - pos: -0.5,14.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3896 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: 6.2924953,10.5 + - rot: -1.5707963267948966 rad + pos: 0.5,13.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3897 - type: EmergencyLight + type: SmallLight components: - - rot: 3.141592697301183 rad - pos: 12.41432,9.5 + - rot: -1.5707963267948966 rad + pos: -7.5,8.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3898 - type: EmergencyLight + type: SmallLight components: - - rot: 3.141592697301183 rad - pos: 16.47682,3.5 + - pos: 8.5,14.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3899 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -24.514448,12 + - pos: 16.5,15.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3900 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: -39.802197,11.207858 + - pos: 14.5,21.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3901 - type: EmergencyLight + type: SmallLight components: - - rot: 4.71238902409608 rad - pos: -22.347473,-1.5 + - pos: 12.5,24.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3902 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: -20.745232,-0.5 + - rot: 1.5707963267948966 rad + pos: 26.5,-4.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3903 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -13.5,-10 + - pos: 30.5,-6.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3904 type: ShellShotgunSlug components: @@ -40644,49 +39660,30 @@ entities: - canCollide: False type: Physics - uid: 3905 - type: EmergencyLight + type: SmallLight components: - - rot: 4.71238902409608 rad - pos: 10.68897,19.5 + - pos: 35.5,-6.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3906 - type: EmergencyLight + type: SmallLight components: - - rot: 3.141592697301183 rad - pos: 8.923345,28.5 + - pos: 38.5,-3.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3907 - type: EmergencyLight + type: SmallLight components: - - rot: 3.141592697301183 rad - pos: -2.4985301,28.5 + - rot: -1.5707963267948966 rad + pos: 43.5,-1.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3908 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: -2.7641551,26.5 + - pos: 41.5,13.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3909 type: WindoorMedicalLocked components: @@ -40695,16 +39692,12 @@ entities: parent: 853 type: Transform - uid: 3910 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -12.509865,6 + - rot: -1.5707963267948966 rad + pos: 43.5,12.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3911 type: CableApcExtension components: @@ -40753,31 +39746,19 @@ entities: parent: 853 type: Transform - uid: 3916 - type: Poweredlight + type: WallLight + components: + - rot: -1.5707963267948966 rad + pos: -5.5,16.5 + parent: 853 + type: Transform +- uid: 3917 + type: SmallLight components: - rot: 1.5707963267948966 rad - pos: 6.105843,-25.592358 + pos: 38.5,12.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 3917 - type: PoweredSmallLight - components: - - rot: 3.141592697301183 rad - pos: -1.4929452,19.970068 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 3918 type: BedsheetSpawner components: @@ -40793,19 +39774,12 @@ entities: parent: 853 type: Transform - uid: 3920 - type: PoweredSmallLight + type: SmallLight components: - - rot: 3.141592697301183 rad - pos: -15.494916,15.968084 + - rot: -1.5707963267948966 rad + pos: 27.5,-10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 3921 type: SalternApc components: @@ -40816,49 +39790,33 @@ entities: - startingCharge: 11999.217 type: Battery - uid: 3922 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -13.5,-17 + - rot: -1.5707963267948966 rad + pos: 27.5,-15.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3923 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -10.5,-17 + - rot: 1.5707963267948966 rad + pos: 24.5,-23.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3924 - type: EmergencyLight + type: SmallLight components: - - rot: 4.71238902409608 rad - pos: 5.7693076,-15.5 + - rot: -1.5707963267948966 rad + pos: 27.5,-24.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3925 - type: EmergencyLight + type: SmallLight components: - - rot: 1.5707963705062866 rad - pos: 2.2274737,8.5 + - rot: 3.141592653589793 rad + pos: 25.5,-18.5 parent: 853 type: Transform - - powerLoad: 1 - type: ApcPowerReceiver - - startingCharge: 30000 - type: Battery - uid: 3926 type: ClothingBackpackDuffelSurgeryFilled components: @@ -41184,24 +40142,15 @@ entities: - canCollide: False type: Physics - uid: 3965 - type: PoweredSmallLight + type: SmallLight components: - - rot: -1.5707963267948966 rad - pos: -6.942113,8.770812 + - pos: 25.5,-20.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 3966 - type: EmergencyLight + type: SmallLight components: - - rot: -1.5707963267948966 rad - pos: -7.223363,7.817687 + - pos: 22.5,-9.5 parent: 853 type: Transform - uid: 3967 @@ -41593,17 +40542,11 @@ entities: - airBlocked: False type: Airtight - uid: 4009 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: 2.100807,-25.514233 + - pos: -5.5,17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4010 type: Firelock components: @@ -41719,16 +40662,12 @@ entities: - airBlocked: False type: Airtight - uid: 4024 - type: Poweredlight + type: WallLight components: - - pos: 7.512093,-22.139233 + - rot: 1.5707963267948966 rad + pos: -9.5,17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4025 type: FirelockGlass components: @@ -41785,17 +40724,12 @@ entities: parent: 853 type: Transform - uid: 4032 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -22.097801,-0.5190892 + - rot: 1.5707963267948966 rad + pos: -9.5,13.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4033 type: Fork components: @@ -41840,8 +40774,6 @@ entities: - pos: -11.5,11.5 parent: 853 type: Transform - - enabled: False - type: PointLight - enabled: False type: AmbientSound - uid: 4039 @@ -42169,18 +41101,15 @@ entities: - canCollide: False type: Physics - uid: 4081 - type: EmergencyLight + type: SmallLight components: - - rot: 4.371139006309477E-08 rad - pos: -4.4964724,-8 + - pos: 12.5,-19.5 parent: 853 type: Transform - - startingCharge: 12224.357 - type: Battery - uid: 4082 - type: EmergencyLight + type: SmallLight components: - - pos: 6.5,-23 + - pos: 9.5,-18.5 parent: 853 type: Transform - uid: 4083 @@ -42428,19 +41357,12 @@ entities: parent: 853 type: Transform - uid: 4115 - type: PoweredSmallLight + type: SmallLight components: - - rot: 3.141592697301183 rad - pos: -22.5,-16 + - rot: -1.5707963267948966 rad + pos: 0.5,-24.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4116 type: AirlockMaintIntLocked components: @@ -42490,43 +41412,24 @@ entities: parent: 853 type: Transform - uid: 4122 - type: PoweredSmallLight + type: SmallLight components: - - rot: -1.5707963267948966 rad - pos: 44.01483,12.438765 + - pos: -6.5,-26.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4123 - type: Poweredlight + type: WallLight + components: + - pos: -12.5,11.5 + parent: 853 + type: Transform +- uid: 4124 + type: WallLight components: - rot: 1.5707963267948966 rad - pos: 46.108562,6.5075245 + pos: -10.5,7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4124 - type: Poweredlight - components: - - rot: 3.141592653589793 rad - pos: -6.2755547,3.0213985 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4125 type: CarpetGreen components: @@ -42661,51 +41564,30 @@ entities: parent: 853 type: Transform - uid: 4145 - type: Poweredlight + type: WallLight + components: + - pos: -11.5,5.5 + parent: 853 + type: Transform +- uid: 4146 + type: WallLight + components: + - pos: -8.5,5.5 + parent: 853 + type: Transform +- uid: 4147 + type: WallLight + components: + - pos: -3.5,5.5 + parent: 853 + type: Transform +- uid: 4148 + type: WallLight components: - rot: -1.5707963267948966 rad - pos: -3.099586,-5.569584 + pos: -16.5,-1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4146 - type: Poweredlight - components: - - pos: -13.50299,1.8497577 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4147 - type: Poweredlight - components: - - pos: -9.505926,1.8653827 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4148 - type: Poweredlight - components: - - rot: 1.5707963267948966 rad - pos: -7.889039,-4.569584 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4149 type: Rack components: @@ -42714,17 +41596,11 @@ entities: parent: 853 type: Transform - uid: 4150 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: -2.9115314,24.482988 + - pos: -12.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4151 type: hydroponicsTray components: @@ -42921,9 +41797,10 @@ entities: ents: [] type: ContainerContainer - uid: 4173 - type: EmergencyLight + type: SmallLight components: - - pos: 10.5,-22 + - rot: -1.5707963267948966 rad + pos: -7.5,-23.5 parent: 853 type: Transform - uid: 4174 @@ -42955,30 +41832,19 @@ entities: parent: 853 type: Transform - uid: 4178 - type: Poweredlight + type: WallLight components: - rot: 3.141592653589793 rad - pos: 50.5,-1 + pos: -13.5,-1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4179 - type: PoweredSmallLight + type: SmallLight components: - - pos: 38.503914,-3.2242432 + - rot: -1.5707963267948966 rad + pos: -7.5,-12.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4180 type: MopBucket components: @@ -43161,17 +42027,12 @@ entities: ents: [] type: ContainerContainer - uid: 4203 - type: Poweredlight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: 47.090073,-10.509963 + pos: -7.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4204 type: Carpet components: @@ -43510,7 +42371,7 @@ entities: parent: 853 type: Transform - uid: 4250 - type: Shelf + type: Rack components: - rot: 4.371139006309477E-08 rad pos: -20.5,7.5 @@ -43575,17 +42436,12 @@ entities: body_bag_label: !type:ContainerSlot {} type: ContainerContainer - uid: 4258 - type: Poweredlight + type: WallLight components: - rot: -1.5707963267948966 rad - pos: 51.918198,-10.509963 + pos: -3.5,-5.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4259 type: Table components: @@ -43819,91 +42675,91 @@ entities: parent: 853 type: Transform - uid: 4291 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 46.5,14.5 parent: 853 type: Transform - uid: 4292 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 47.5,14.5 parent: 853 type: Transform - uid: 4293 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 48.5,14.5 parent: 853 type: Transform - uid: 4294 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 49.5,14.5 parent: 853 type: Transform - uid: 4295 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 50.5,14.5 parent: 853 type: Transform - uid: 4296 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,14.5 parent: 853 type: Transform - uid: 4297 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,13.5 parent: 853 type: Transform - uid: 4298 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,12.5 parent: 853 type: Transform - uid: 4299 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,11.5 parent: 853 type: Transform - uid: 4300 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,10.5 parent: 853 type: Transform - uid: 4301 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,9.5 parent: 853 type: Transform - uid: 4302 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,8.5 parent: 853 type: Transform - uid: 4303 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,7.5 @@ -44041,19 +42897,12 @@ entities: ents: [] type: ContainerContainer - uid: 4321 - type: PoweredSmallLight + type: SmallLight components: - - rot: 1.5707963267948966 rad - pos: 38.030457,12.470015 + - rot: -1.5707963267948966 rad + pos: -11.5,-10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4322 type: CableApcExtension components: @@ -44231,17 +43080,12 @@ entities: - canCollide: False type: Physics - uid: 4338 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 35.905144,-2.4519515 + - rot: 3.141592653589793 rad + pos: -0.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4339 type: CableHV components: @@ -44557,77 +43401,77 @@ entities: parent: 853 type: Transform - uid: 4377 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 46.5,-13.5 parent: 853 type: Transform - uid: 4378 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 46.5,-14.5 parent: 853 type: Transform - uid: 4379 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 45.5,-14.5 parent: 853 type: Transform - uid: 4380 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 47.5,-14.5 parent: 853 type: Transform - uid: 4381 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 48.5,-14.5 parent: 853 type: Transform - uid: 4382 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 49.5,-14.5 parent: 853 type: Transform - uid: 4383 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 50.5,-14.5 parent: 853 type: Transform - uid: 4384 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 51.5,-14.5 parent: 853 type: Transform - uid: 4385 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 52.5,-14.5 parent: 853 type: Transform - uid: 4386 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 52.5,-13.5 parent: 853 type: Transform - uid: 4387 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 53.5,-14.5 @@ -45438,53 +44282,31 @@ entities: - startingCharge: 3200136 type: Battery - uid: 4483 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 12.942612,-25.529858 + - pos: -9.5,1.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4484 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: 4.928932,-28.529858 + - rot: 3.141592653589793 rad + pos: -6.5,3.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4485 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -2.0884767,-23.529858 + - pos: -15.5,-17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4486 - type: Poweredlight + type: WallLight components: - - rot: -1.5707963267948966 rad - pos: -13.129641,-21.475588 + - rot: 1.5707963267948966 rad + pos: -17.5,-21.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4487 type: CableMV components: @@ -47063,14 +45885,14 @@ entities: parent: 853 type: Transform - uid: 4710 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 20.5,14.5 parent: 853 type: Transform - uid: 4711 - type: LowWall + type: Grille components: - rot: 4.371139006309477E-08 rad pos: 22.5,14.5 @@ -47323,10 +46145,10 @@ entities: parent: 853 type: Transform - uid: 4742 - type: ChairWood + type: SmallLight components: - - rot: -1.5707963267948966 rad - pos: -22.5,-6.5 + - rot: 3.141592653589793 rad + pos: -22.5,-15.5 parent: 853 type: Transform - uid: 4743 @@ -47662,30 +46484,19 @@ entities: - canCollide: False type: Physics - uid: 4782 - type: Poweredlight - components: - - pos: 23.519926,-4.184294 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4783 - type: PoweredSmallLight + type: WallLight components: - rot: 1.5707963267948966 rad - pos: -30.97177,0.51521087 + pos: -17.5,-25.5 + parent: 853 + type: Transform +- uid: 4783 + type: SmallLight + components: + - rot: 3.141592653589793 rad + pos: -14.5,-15.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4784 type: CableApcExtension components: @@ -48378,53 +47189,33 @@ entities: - canCollide: False type: Physics - uid: 4852 - type: PoweredSmallLight + type: SmallLight components: - - rot: 1.5707963267948966 rad - pos: -30.956144,-2.5004141 + - pos: -25.5,-10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4853 - type: Poweredlight + type: WallLight components: - rot: -1.5707963267948966 rad - pos: 16.911247,7.525623 + pos: -13.5,-25.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4854 - type: PoweredSmallLight + type: SmallLight components: - - rot: -1.5707963267948966 rad - pos: 1,-24.5 + - rot: 3.141592653589793 rad + pos: -29.5,-8.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4855 - type: LowWall + type: Grille components: - pos: 17.5,19.5 parent: 853 type: Transform - uid: 4856 - type: LowWall + type: Grille components: - pos: 17.5,18.5 parent: 853 @@ -48524,19 +47315,19 @@ entities: parent: 853 type: Transform - uid: 4872 - type: LowWall + type: Grille components: - pos: 2.5,-31.5 parent: 853 type: Transform - uid: 4873 - type: LowWall + type: Grille components: - pos: 3.5,-31.5 parent: 853 type: Transform - uid: 4874 - type: LowWall + type: Grille components: - pos: 4.5,-31.5 parent: 853 @@ -48638,19 +47429,12 @@ entities: - canCollide: False type: Physics - uid: 4888 - type: PoweredSmallLight + type: SmallLight components: - - rot: -1.5707963267948966 rad - pos: -15,-5.3 + - rot: 1.5707963267948966 rad + pos: -30.5,-5.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4889 type: CableApcExtension components: @@ -48795,13 +47579,13 @@ entities: parent: 853 type: Transform - uid: 4907 - type: LowWall + type: Grille components: - pos: -0.5,6.5 parent: 853 type: Transform - uid: 4908 - type: LowWall + type: Grille components: - pos: 0.5,6.5 parent: 853 @@ -48819,17 +47603,12 @@ entities: parent: 853 type: Transform - uid: 4911 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: -17.91089,-25.522463 + - rot: -1.5707963267948966 rad + pos: -13.5,-21.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4912 type: ReinforcedWindow components: @@ -48885,7 +47664,7 @@ entities: ents: [] type: ContainerContainer - uid: 4920 - type: LowWall + type: Grille components: - pos: -0.5,9.5 parent: 853 @@ -48999,7 +47778,7 @@ entities: cabinetSlot: !type:ContainerSlot {} type: ContainerContainer - uid: 4933 - type: LowWall + type: Grille components: - pos: 17.5,17.5 parent: 853 @@ -49068,14 +47847,12 @@ entities: cabinetSlot: !type:ContainerSlot {} type: ContainerContainer - uid: 4941 - type: ExtinguisherCabinetFilled + type: WallLight components: - - pos: -10.5,13.5 + - rot: 3.141592653589793 rad + pos: -9.5,-20.5 parent: 853 type: Transform - - containers: - cabinetSlot: !type:ContainerSlot {} - type: ContainerContainer - uid: 4942 type: ExtinguisherCabinetFilled components: @@ -49176,89 +47953,52 @@ entities: cabinetSlot: !type:ContainerSlot {} type: ContainerContainer - uid: 4953 - type: Poweredlight + type: WallLight components: - - rot: 1.5707963267948966 rad - pos: -25.886164,-4.550339 + - pos: -9.5,-17.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4954 - type: Poweredlight - components: - - rot: 1.5707963267948966 rad - pos: 31.116735,0.101480484 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4955 - type: Poweredlight - components: - - rot: 3.141592653589793 rad - pos: 25.960485,0.023355484 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4956 - type: Poweredlight - components: - - rot: 3.141592653589793 rad - pos: 29.00736,0.038980484 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4957 - type: Poweredlight - components: - - rot: 3.141592653589793 rad - pos: 6.4960318,3.0213985 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4958 - type: Poweredlight - components: - - rot: 1.5707963267948966 rad - pos: -2.8850474,30.48638 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4959 - type: Poweredlight + type: WallLight components: - rot: -1.5707963267948966 rad - pos: 9.911827,30.439505 + pos: 44.5,9.5 + parent: 853 + type: Transform +- uid: 4955 + type: WallLight + components: + - rot: 1.5707963267948966 rad + pos: 38.5,9.5 + parent: 853 + type: Transform +- uid: 4956 + type: WallLight + components: + - rot: -1.5707963267948966 rad + pos: 36.5,12.5 + parent: 853 + type: Transform +- uid: 4957 + type: WallLight + components: + - rot: 1.5707963267948966 rad + pos: 45.5,12.5 + parent: 853 + type: Transform +- uid: 4958 + type: WallLight + components: + - pos: 46.5,4.5 + parent: 853 + type: Transform +- uid: 4959 + type: WallLight + components: + - rot: 3.141592653589793 rad + pos: 50.5,-0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4960 type: ChairPilotSeat components: @@ -49405,46 +48145,26 @@ entities: parent: 853 type: Transform - uid: 4983 - type: PoweredSmallLight - components: - - rot: -1.5707963267948966 rad - pos: 28,-24.5 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4984 - type: PoweredSmallLight - components: - - pos: 25.5,-20 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 4985 - type: PoweredSmallLight + type: SmallLight components: - rot: 1.5707963267948966 rad - pos: 24,-23.5 + pos: -30.5,-2.5 + parent: 853 + type: Transform +- uid: 4984 + type: SmallLight + components: + - rot: 1.5707963267948966 rad + pos: -30.5,0.5 + parent: 853 + type: Transform +- uid: 4985 + type: SmallLight + components: + - rot: 1.5707963267948966 rad + pos: -33.5,-0.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 4986 type: ComfyChair components: @@ -49765,10 +48485,10 @@ entities: parent: 853 type: Transform - uid: 5031 - type: ChairWood + type: SmallLight components: - - rot: 1.5707963267948966 rad - pos: -24.5,-2.5 + - rot: -1.5707963267948966 rad + pos: -18.5,-4.5 parent: 853 type: Transform - uid: 5032 @@ -49790,45 +48510,26 @@ entities: - canCollide: False type: Physics - uid: 5034 - type: PoweredSmallLight + type: SmallLight components: - - pos: -21.5,18 + - rot: -1.5707963267948966 rad + pos: -15.5,-5.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 5035 - type: PoweredSmallLight + type: SmallLight components: - - pos: -23.5,21 + - rot: 3.141592653589793 rad + pos: -12.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 5036 - type: PoweredSmallLight + type: SmallLight components: - rot: 1.5707963267948966 rad - pos: -27,17.5 + pos: -12.5,-7.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - enabled: False - type: AmbientSound - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 5037 type: CrateEngineeringCableLV components: @@ -50282,7 +48983,7 @@ entities: parent: 853 type: Transform - uid: 5092 - type: LowWall + type: Grille components: - pos: -1.5,9.5 parent: 853 @@ -50324,13 +49025,13 @@ entities: ents: [] type: ContainerContainer - uid: 5097 - type: LowWall + type: Grille components: - pos: 13.5,1.5 parent: 853 type: Transform - uid: 5098 - type: LowWall + type: Grille components: - pos: 13.5,-2.5 parent: 853 @@ -50413,7 +49114,7 @@ entities: - canCollide: False type: Physics - uid: 5109 - type: LowWall + type: Grille components: - pos: 13.5,0.5 parent: 853 @@ -50612,16 +49313,12 @@ entities: ents: [] type: ContainerContainer - uid: 5131 - type: Poweredlight + type: WallLight components: - - pos: 18.51463,1.8678906 + - rot: -1.5707963267948966 rad + pos: 51.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 5132 type: Poweredlight components: @@ -50648,33 +49345,24 @@ entities: parent: 853 type: Transform - uid: 5135 - type: LowWall + type: Grille components: - pos: 0.5,-14.5 parent: 853 type: Transform - uid: 5136 - type: Poweredlight + type: WallLight components: - - pos: -2.5304983,9.057686 + - rot: 1.5707963267948966 rad + pos: 47.5,-4.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 5137 - type: Poweredlight + type: WallLight components: - - pos: 12.5166855,27.017359 + - pos: 54.5,-9.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 5138 type: Firelock components: @@ -50788,29 +49476,18 @@ entities: - canCollide: False type: Physics - uid: 5152 - type: Poweredlight + type: WallLight + components: + - pos: 44.5,-9.5 + parent: 853 + type: Transform +- uid: 5153 + type: WallLight components: - rot: 1.5707963267948966 rad - pos: 38,9.5 + pos: 47.5,-10.5 parent: 853 type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer -- uid: 5153 - type: Poweredlight - components: - - rot: -1.5707963267948966 rad - pos: 45,9.5 - parent: 853 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer - uid: 5154 type: ReinforcedWindow components: @@ -50829,4 +49506,11 @@ entities: - pos: 17.5,17.5 parent: 853 type: Transform +- uid: 5157 + type: WallLight + components: + - rot: -1.5707963267948966 rad + pos: 51.5,-10.5 + parent: 853 + type: Transform ... diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml index e1c4d24682..acc2253e20 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml @@ -4,8 +4,9 @@ description: A booze dispenser with a single slot for a container to be filled. parent: ReagentDispenserBase components: + - type: Rotatable - type: Sprite sprite: Structures/dispensers.rsi - state: booze_dispenser + state: booze - type: ReagentDispenser pack: BoozeDispenserInventory diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml index ea409f1bd2..57315b8f64 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml @@ -6,10 +6,7 @@ components: - type: Sprite sprite: Structures/dispensers.rsi - state: industrial_dispenser - - type: Icon - sprite: Structures/dispensers.rsi - state: industrial_dispenser + state: industrial-working - type: ReagentDispenser pack: ChemDispenserStandardInventory - type: ApcPowerReceiver diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml index bf981ba7e7..0332371a4c 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml @@ -4,8 +4,9 @@ parent: ReagentDispenserBase description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers. components: + - type: Rotatable - type: Sprite sprite: Structures/dispensers.rsi - state: soda_dispenser + state: soda - type: ReagentDispenser pack: SodaDispenserInventory diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index d59766d80e..52e6fc1598 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -64,66 +64,6 @@ graph: table node: Table -- type: entity - id: TableBar - parent: TableBase - name: bar table - description: Fancy table. Perfect for serving drinks. - components: - - type: Sprite - sprite: Structures/Furniture/Tables/bar.rsi - - type: Icon - sprite: Structures/Furniture/Tables/bar.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 1 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/metalbreak.ogg - - !type:SpawnEntitiesBehavior - spawn: - SheetSteel1: - min: 1 - max: 1 - MaterialCloth1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: table - node: TableBar - -- type: entity - id: TableMetal - parent: TableBase - name: metal table - description: Just a metal table. - components: - - type: Sprite - sprite: Structures/Furniture/Tables/metal.rsi - - type: Icon - sprite: Structures/Furniture/Tables/metal.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/metalbreak.ogg - - !type:SpawnEntitiesBehavior - spawn: - SheetSteel1: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: entity id: TableReinforced parent: TableBase @@ -217,6 +157,39 @@ graph: table node: TableReinforcedGlass +- type: entity + id: TablePlasmaGlass + parent: TableBase + name: plasma glass table + description: A square piece of plasma glass, standing on four metal legs. Pretty! + components: + - type: Sprite + sprite: Structures/Furniture/Tables/plasma.rsi + - type: Icon + sprite: Structures/Furniture/Tables/plasma.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/glass_break2.ogg + - !type:SpawnEntitiesBehavior + spawn: + ShardGlassPlasma: + min: 1 + max: 1 + PartRodMetal1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Construction + graph: table + node: TablePlasmaGlass + - type: entity id: TableWood parent: TableBase diff --git a/Resources/Prototypes/Entities/Structures/Furniture/seats.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml similarity index 93% rename from Resources/Prototypes/Entities/Structures/Furniture/seats.yml rename to Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 0ada5b3afb..a3a146db99 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/seats.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -19,7 +19,7 @@ - VaultImpassable - SmallImpassable - type: Sprite - sprite: Structures/Furniture/furniture.rsi + sprite: Structures/Furniture/chairs.rsi noRot: true - type: Strap position: Stand @@ -50,7 +50,6 @@ - type: Rotatable - type: Sprite state: chair - color: "#8e9799" - type: Physics fixtures: - shape: @@ -72,8 +71,7 @@ components: - type: Anchorable - type: Sprite - state: stool_base - color: "#8e9799" + state: stool - type: Physics bodyType: Static fixtures: @@ -99,7 +97,7 @@ rotateWhileAnchored: true - type: Anchorable - type: Sprite - state: bar_stool + state: bar - type: Physics bodyType: Static fixtures: @@ -122,7 +120,7 @@ - type: Rotatable rotateWhileAnchored: true - type: Sprite - state: officechair_white + state: office-white - type: Physics fixtures: - shape: @@ -142,7 +140,7 @@ parent: ChairOfficeLight components: - type: Sprite - state: officechair_dark + state: office-dark - type: Construction graph: seat node: chairOfficeDark @@ -157,7 +155,7 @@ anchored: true - type: Anchorable - type: Sprite - state: comfychair_preview + state: comfy - type: Physics bodyType: Static fixtures: @@ -178,8 +176,7 @@ parent: SeatBase components: - type: Sprite - state: wooden_chair - color: "white" + state: wooden - type: Rotatable - type: Physics fixtures: @@ -226,8 +223,7 @@ - type: Anchorable - type: Rotatable - type: Sprite - sprite: Structures/Furniture/furniture.rsi - state: shuttle_chair + state: shuttle netsync: false - type: Physics bodyType: Static diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index dafa7cb1d1..99a1c75ef1 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -498,6 +498,7 @@ visuals: - type: VendingMachineVisualizer normalUnshaded: true + ejectUnshaded: true denyUnshaded: true broken: true - type: WiresVisualizer diff --git a/Resources/Prototypes/Entities/Structures/Power/parts.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml similarity index 61% rename from Resources/Prototypes/Entities/Structures/Power/parts.yml rename to Resources/Prototypes/Entities/Structures/Power/apc.yml index a63a448ea0..ff3335bcae 100644 --- a/Resources/Prototypes/Entities/Structures/Power/parts.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -1,48 +1,3 @@ -- type: entity - abstract: true - id: BaseSubstation - parent: BaseMachine - name: substation - description: Reduces the voltage of electricity put into it. - placement: - mode: SnapgridCenter - components: - - type: Sprite - sprite: Structures/Power/substation.rsi - layers: - - state: substation - - state: screen - shader: unshaded - - state: full - shader: unshaded - - type: Battery - maxCharge: 1000 - startingCharge: 1000 - - type: ExaminableBattery - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#3db83b" - castShadows: false - - type: NodeContainer - examinable: true - nodes: - input: - !type:CableDeviceNode - nodeGroupID: HVPower - output: - !type:CableDeviceNode - nodeGroupID: MVPower - - type: BatteryCharger - voltage: High - - type: BatteryDischarger - voltage: Medium - - type: PowerNetworkBattery - maxSupply: 150000 - maxChargeRate: 5000 - supplyRampTolerance: 5000 - supplyRampRate: 1000 - - type: entity abstract: true id: BaseApc diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml index 8004a324a2..a92479c317 100644 --- a/Resources/Prototypes/Entities/Structures/Power/smes.yml +++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml @@ -16,8 +16,6 @@ sprite: Structures/Power/smes.rsi layers: - state: smes - - state: smes-display - shader: unshaded - type: Smes - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml new file mode 100644 index 0000000000..e7434f42fc --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -0,0 +1,44 @@ +- type: entity + abstract: true + id: BaseSubstation + parent: BaseMachine + name: substation + description: Reduces the voltage of electricity put into it. + placement: + mode: SnapgridCenter + components: + - type: Sprite + sprite: Structures/Power/substation.rsi + layers: + - state: substation + - state: screen + shader: unshaded + - state: full + shader: unshaded + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: ExaminableBattery + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#3db83b" + castShadows: false + - type: NodeContainer + examinable: true + nodes: + input: + !type:CableDeviceNode + nodeGroupID: HVPower + output: + !type:CableDeviceNode + nodeGroupID: MVPower + - type: BatteryCharger + voltage: High + - type: BatteryDischarger + voltage: Medium + - type: PowerNetworkBattery + maxSupply: 150000 + maxChargeRate: 5000 + supplyRampTolerance: 5000 + supplyRampRate: 1000 diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml index 27d1b81f23..bf392e9473 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml @@ -46,12 +46,3 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - -- type: entity - id: Shelf - parent: Rack - name: shelf - description: A shelf for storing things on. - components: - - type: Sprite - state: shelf diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml index 9c9e8d563e..fef2998108 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml @@ -4,6 +4,7 @@ name: grille description: A flimsy framework of iron rods. components: + - type: CanBuildWindowOnTop - type: Sprite netsync: false drawdepth: Walls diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 3139e52891..867f2b7f76 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -306,7 +306,6 @@ name: reinforced wall components: - type: Sprite - color: "#889192" sprite: Structures/Walls/solid.rsi - type: Icon sprite: Structures/Walls/solid.rsi @@ -421,7 +420,6 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - color: "#889192" sprite: Structures/Walls/solid.rsi - type: Construction graph: girder diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml index 73cc09426d..c86e770b03 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml @@ -27,7 +27,7 @@ max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Window + - type: IconSmooth base: pwindow - type: Construction graph: window diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml index 67d113e459..44836e9a9a 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -27,7 +27,7 @@ max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Window + - type: IconSmooth base: rwindow - type: Construction graph: window diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index 712d0c7ba2..c3076e3023 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -10,7 +10,6 @@ components: - type: RCDDeconstructWhitelist - type: Sprite - color: "#DDDDDD" netsync: false drawdepth: WallTops sprite: Structures/Windows/window.rsi @@ -50,8 +49,10 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Airtight - - type: Window + - type: IconSmooth + key: windows base: window + - type: Window - type: Construction graph: window node: window diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml index 44c7448728..9299319cb7 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/tables.yml @@ -51,6 +51,12 @@ amount: 1 doAfter: 1 + - to: TablePlasmaGlass + steps: + - material: PlasmaGlass + amount: 1 + doAfter: 1 + - to: TableWood steps: - material: WoodPlank @@ -69,24 +75,6 @@ - tool: Anchoring doAfter: 1 - - to: TableBar - steps: - - material: Cloth - amount: 1 - doAfter: 1 - - - node: TableBar - entity: TableBar - edges: - - to: Table - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 1 - steps: - - tool: Prying - doAfter: 1 - - node: TableReinforced entity: TableReinforced edges: @@ -123,6 +111,18 @@ - tool: Anchoring doAfter: 1 + - node: TablePlasmaGlass + entity: TablePlasmaGlass + edges: + - to: TableFrame + completed: + - !type:SpawnPrototype + prototype: SheetPGlass1 + amount: 1 + steps: + - tool: Anchoring + doAfter: 1 + - node: TableWood entity: TableWood edges: diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index a3c6ef90ff..30e7b23596 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -7,7 +7,7 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Structures/Furniture/furniture.rsi + sprite: Structures/Furniture/chairs.rsi state: chair objectType: Structure placementMode: SnapgridCenter @@ -24,8 +24,8 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Structures/Furniture/furniture.rsi - state: stool_base + sprite: Structures/Furniture/chairs.rsi + state: stool objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -41,8 +41,8 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Structures/Furniture/furniture.rsi - state: bar_stool + sprite: Structures/Furniture/chairs.rsi + state: bar objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -58,8 +58,8 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Structures/Furniture/furniture.rsi - state: officechair_white + sprite: Structures/Furniture/chairs.rsi + state: office-white objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -75,8 +75,8 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Structures/Furniture/furniture.rsi - state: officechair_dark + sprite: Structures/Furniture/chairs.rsi + state: office-dark objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -92,8 +92,8 @@ category: Furniture description: It looks comfy. icon: - sprite: Structures/Furniture/furniture.rsi - state: comfychair_preview + sprite: Structures/Furniture/chairs.rsi + state: comfy objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -109,8 +109,8 @@ category: Furniture description: You sit in this. Either by will or force. icon: - sprite: Structures/Furniture/furniture.rsi - state: wooden_chair + sprite: Structures/Furniture/chairs.rsi + state: wooden objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false diff --git a/Resources/Prototypes/Recipes/Construction/tables.yml b/Resources/Prototypes/Recipes/Construction/tables.yml index 9c1f1afeeb..0140ce290c 100644 --- a/Resources/Prototypes/Recipes/Construction/tables.yml +++ b/Resources/Prototypes/Recipes/Construction/tables.yml @@ -15,23 +15,6 @@ conditions: - !type:TileNotBlocked {} -- type: construction - name: bar table - id: TableBar - graph: table - startNode: start - targetNode: TableBar - category: Structures - description: A fancy table. Perfect for serving drinks. - icon: - sprite: Structures/Furniture/Tables/bar.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked {} - - type: construction name: reinforced table id: TableReinforced @@ -83,6 +66,23 @@ conditions: - !type:TileNotBlocked {} +- type: construction + name: plasma glass table + id: TablePlasmaGlass + graph: table + startNode: start + targetNode: TablePlasmaGlass + category: Structures + description: A square piece of plasma glass, standing on four metal legs. Pretty! + icon: + sprite: Structures/Furniture/Tables/plasma.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked {} + - type: construction name: wood table id: TableWood @@ -115,4 +115,4 @@ placementMode: SnapgridCenter canBuildInImpassable: false conditions: - - !type:TileNotBlocked {} \ No newline at end of file + - !type:TileNotBlocked {} diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index e29e1b349a..ad385772b2 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -6,7 +6,7 @@ - plating is_subfloor: false can_crowbar: true - footstep_sounds: + footstep_sounds: collection: footstep_floor friction: 0.30 item_drop: FloorTileItemDark @@ -61,6 +61,18 @@ friction: 0.30 item_drop: FloorTileItemGCircuit +- type: tile + name: floor_blue_circuit + display_name: Blue circuit floor + texture: "blue_circuit" + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + - type: tile name: floor_lino display_name: Linoleum floor @@ -274,6 +286,18 @@ friction: 0.30 item_drop: FloorTileItemGold +- type: tile + name: floor_silver + display_name: Silver Tile + texture: silver + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_floor + friction: 0.30 + - type: tile name: floor_glass display_name: glass floor @@ -300,54 +324,6 @@ friction: 0.30 item_drop: SheetRGlass1 -- type: tile - name: floor_warning1 - display_name: Warning Tile - texture: steel_warning1 - base_turfs: - - plating - is_subfloor: false - can_crowbar: true - footstep_sounds: - collection: footstep_floor - friction: 0.30 - -- type: tile - name: floor_warning2 - display_name: Beware Tile - texture: steel_warning2 - base_turfs: - - plating - is_subfloor: false - can_crowbar: true - footstep_sounds: - collection: footstep_floor - friction: 0.30 - -- type: tile - name: floor_white_warning1 - display_name: White Warning Tile - texture: white_warning1 - base_turfs: - - plating - is_subfloor: false - can_crowbar: true - footstep_sounds: - collection: footstep_floor - friction: 0.30 - -- type: tile - name: floor_white_warning2 - display_name: White Beware Tile - texture: white_warning2 - base_turfs: - - plating - is_subfloor: false - can_crowbar: true - footstep_sounds: - collection: footstep_floor - friction: 0.30 - - type: tile name: floor_blue display_name: Blue Tile diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/.png deleted file mode 100644 index 2dacf82df7..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json b/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json deleted file mode 100644 index c317dd0c4a..0000000000 --- a/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/4f4f8e186bd6ded4d424fad1dee49d3d969adc7c", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "" - }, - { - "name": "tile" - }, - { - "name": "tile-white-techfloor" - }, - { - "name": "tile_bcarpet" - }, - { - "name": "tile_blucarpet" - }, - { - "name": "tile_cafe" - }, - { - "name": "tile_carpet" - }, - { - "name": "tile_dark" - }, - { - "name": "tile_dark_bluecorner" - }, - { - "name": "tile_dark_brownperforated" - }, - { - "name": "tile_dark_brownplatform" - }, - { - "name": "tile_dark_cargo" - }, - { - "name": "tile_dark_cyancorner" - }, - { - "name": "tile_dark_danger" - }, - { - "name": "tile_dark_golden" - }, - { - "name": "tile_dark_grayperforated" - }, - { - "name": "tile_dark_grayplatform" - }, - { - "name": "tile_dark_monofloor" - }, - { - "name": "tile_dark_orangecorner" - }, - { - "name": "tile_dark_panels" - }, - { - "name": "tile_dark_techfloor" - }, - { - "name": "tile_dark_techfloor_grid" - }, - { - "name": "tile_dark_violetcorener" - }, - { - "name": "tile_gaycarpet" - }, - { - "name": "tile_grass" - }, - { - "name": "tile_oracarpet" - }, - { - "name": "tile_purcarpet" - }, - { - "name": "tile_sblucarpet" - }, - { - "name": "tile_steel" - }, - { - "name": "tile_steel_bar_dance" - }, - { - "name": "tile_steel_bar_flat" - }, - { - "name": "tile_steel_bar_light" - }, - { - "name": "tile_steel_bluecorner" - }, - { - "name": "tile_steel_brownperforated" - }, - { - "name": "tile_steel_brownplatform" - }, - { - "name": "tile_steel_cargo" - }, - { - "name": "tile_steel_cyancorner" - }, - { - "name": "tile_steel_danger" - }, - { - "name": "tile_steel_golden" - }, - { - "name": "tile_steel_grayperforated" - }, - { - "name": "tile_steel_grayplatform" - }, - { - "name": "tile_steel_monofloor" - }, - { - "name": "tile_steel_orangecorner" - }, - { - "name": "tile_steel_panels" - }, - { - "name": "tile_steel_techfloor" - }, - { - "name": "tile_steel_techfloor_grid" - }, - { - "name": "tile_steel_violetcorener" - }, - { - "name": "tile_techmaint" - }, - { - "name": "tile_techmaint_cargo" - }, - { - "name": "tile_techmaint_panels" - }, - { - "name": "tile_techmaint_perforated" - }, - { - "name": "tile_turcarpet" - }, - { - "name": "tile_white" - }, - { - "name": "tile_white_bluecorner" - }, - { - "name": "tile_white_brownperforated" - }, - { - "name": "tile_white_brownplatform" - }, - { - "name": "tile_white_cargo" - }, - { - "name": "tile_white_cyancorner" - }, - { - "name": "tile_white_danger" - }, - { - "name": "tile_white_golden" - }, - { - "name": "tile_white_grayperforated" - }, - { - "name": "tile_white_grayplatform" - }, - { - "name": "tile_white_monofloor" - }, - { - "name": "tile_white_orangecorner" - }, - { - "name": "tile_white_panels" - }, - { - "name": "tile_white_techfloor_grid" - }, - { - "name": "tile_white_violetcorener" - }, - { - "name": "tile_wood" - } - ] -} diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile-white-techfloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile-white-techfloor.png deleted file mode 100644 index 53753020b3..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile-white-techfloor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile.png deleted file mode 100644 index 67a387805a..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_bcarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_bcarpet.png deleted file mode 100644 index c042dfd68c..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_bcarpet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_blucarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_blucarpet.png deleted file mode 100644 index 3e4541309f..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_blucarpet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_cafe.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_cafe.png deleted file mode 100644 index c68db272c8..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_cafe.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_carpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_carpet.png deleted file mode 100644 index e331cb0630..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_carpet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark.png deleted file mode 100644 index cde5b73f98..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_bluecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_bluecorner.png deleted file mode 100644 index 166d2b9c28..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_bluecorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownperforated.png deleted file mode 100644 index 98f62fa1d1..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownperforated.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownplatform.png deleted file mode 100644 index 1ea2b76767..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_brownplatform.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cargo.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cargo.png deleted file mode 100644 index 7da79c558d..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cargo.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cyancorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cyancorner.png deleted file mode 100644 index 59f9ba2777..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_cyancorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_danger.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_danger.png deleted file mode 100644 index 28db1f5aff..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_danger.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_golden.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_golden.png deleted file mode 100644 index 32e6d7a915..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_golden.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayperforated.png deleted file mode 100644 index 8078fe1eb4..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayperforated.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayplatform.png deleted file mode 100644 index 25b13e433a..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_grayplatform.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_monofloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_monofloor.png deleted file mode 100644 index c01764c5c9..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_monofloor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_orangecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_orangecorner.png deleted file mode 100644 index a877ddf839..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_orangecorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_panels.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_panels.png deleted file mode 100644 index c3ca6a4f0e..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_panels.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor.png deleted file mode 100644 index e6a4b5a90c..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor_grid.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor_grid.png deleted file mode 100644 index c8192ff8b4..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_techfloor_grid.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_violetcorener.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_violetcorener.png deleted file mode 100644 index 8488095075..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_dark_violetcorener.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_gaycarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_gaycarpet.png deleted file mode 100644 index e8462febbc..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_gaycarpet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_grass.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_grass.png deleted file mode 100644 index f366445342..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_grass.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_oracarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_oracarpet.png deleted file mode 100644 index a495bd2c77..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_oracarpet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_purcarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_purcarpet.png deleted file mode 100644 index 973b0c1577..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_purcarpet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_sblucarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_sblucarpet.png deleted file mode 100644 index e80e7ebfda..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_sblucarpet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel.png deleted file mode 100644 index d8b9e774e8..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_dance.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_dance.png deleted file mode 100644 index fe713b8f75..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_dance.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_flat.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_flat.png deleted file mode 100644 index 5797b322fb..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_flat.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_light.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_light.png deleted file mode 100644 index 070fa4485d..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bar_light.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bluecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bluecorner.png deleted file mode 100644 index d3b1205da8..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_bluecorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownperforated.png deleted file mode 100644 index f1ad0110a3..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownperforated.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownplatform.png deleted file mode 100644 index 7d36f076f0..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_brownplatform.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cargo.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cargo.png deleted file mode 100644 index 60eb4f04dd..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cargo.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cyancorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cyancorner.png deleted file mode 100644 index b3d7bc43f3..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_cyancorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_danger.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_danger.png deleted file mode 100644 index 09a8dade1a..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_danger.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_golden.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_golden.png deleted file mode 100644 index 1214eda7e7..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_golden.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayperforated.png deleted file mode 100644 index 78b42b1b8c..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayperforated.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayplatform.png deleted file mode 100644 index aee05e894e..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_grayplatform.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_monofloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_monofloor.png deleted file mode 100644 index cb46880ce5..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_monofloor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_orangecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_orangecorner.png deleted file mode 100644 index df2e573844..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_orangecorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_panels.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_panels.png deleted file mode 100644 index a597890f17..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_panels.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor.png deleted file mode 100644 index dc6191bf12..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor_grid.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor_grid.png deleted file mode 100644 index fd2280da8e..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_techfloor_grid.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_violetcorener.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_violetcorener.png deleted file mode 100644 index a958b0f455..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_steel_violetcorener.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint.png deleted file mode 100644 index a35aaa5cef..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_cargo.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_cargo.png deleted file mode 100644 index f0cbaf2b99..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_cargo.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_panels.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_panels.png deleted file mode 100644 index eb6f272a73..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_panels.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_perforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_perforated.png deleted file mode 100644 index 6f116132d8..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_techmaint_perforated.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_turcarpet.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_turcarpet.png deleted file mode 100644 index ec52a1cb64..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_turcarpet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white.png deleted file mode 100644 index d9f8cf2051..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_bluecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_bluecorner.png deleted file mode 100644 index 6a0f23e42f..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_bluecorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownperforated.png deleted file mode 100644 index e8ff32c261..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownperforated.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownplatform.png deleted file mode 100644 index 80c59f2d61..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_brownplatform.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cargo.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cargo.png deleted file mode 100644 index 600ff0a286..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cargo.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cyancorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cyancorner.png deleted file mode 100644 index e078b95aa9..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_cyancorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_danger.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_danger.png deleted file mode 100644 index 89b6f24e26..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_danger.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_golden.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_golden.png deleted file mode 100644 index 20b7ea8f3a..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_golden.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayperforated.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayperforated.png deleted file mode 100644 index 37c50739c7..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayperforated.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayplatform.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayplatform.png deleted file mode 100644 index 919efe0f9a..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_grayplatform.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_monofloor.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_monofloor.png deleted file mode 100644 index 04a2f3ca67..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_monofloor.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_orangecorner.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_orangecorner.png deleted file mode 100644 index ae2b7d4010..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_orangecorner.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_panels.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_panels.png deleted file mode 100644 index 7e8ba23e74..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_panels.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_techfloor_grid.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_techfloor_grid.png deleted file mode 100644 index 559cb58933..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_techfloor_grid.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_violetcorener.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_violetcorener.png deleted file mode 100644 index 2eb64d4eb3..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_white_violetcorener.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_wood.png b/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_wood.png deleted file mode 100644 index c862398894..0000000000 Binary files a/Resources/Textures/Objects/Tiles/cevtile.rsi/tile_wood.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png index cde5b73f98..e277ec85a5 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/dark.png and b/Resources/Textures/Objects/Tiles/tile.rsi/dark.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/gcircuit.png b/Resources/Textures/Objects/Tiles/tile.rsi/gcircuit.png index c8059ec99e..46423b52a7 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/gcircuit.png and b/Resources/Textures/Objects/Tiles/tile.rsi/gcircuit.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/gold.png b/Resources/Textures/Objects/Tiles/tile.rsi/gold.png index 80edabf429..a417d1cd2a 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/gold.png and b/Resources/Textures/Objects/Tiles/tile.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index d72fd5879c..cfb01a7d76 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -43,6 +43,9 @@ { "name": "steel_techfloor_grid" }, + { + "name": "silver" + }, { "name": "dark_techfloor_grid" }, diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/showroom.png b/Resources/Textures/Objects/Tiles/tile.rsi/showroom.png index 114070cd63..ef1747c427 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/showroom.png and b/Resources/Textures/Objects/Tiles/tile.rsi/showroom.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/silver.png b/Resources/Textures/Objects/Tiles/tile.rsi/silver.png new file mode 100644 index 0000000000..8cd484aee4 Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/silver.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png index d8b9e774e8..349fe828a7 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/steel.png and b/Resources/Textures/Objects/Tiles/tile.rsi/steel.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white.png b/Resources/Textures/Objects/Tiles/tile.rsi/white.png index d9f8cf2051..dde26807d0 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/white.png and b/Resources/Textures/Objects/Tiles/tile.rsi/white.png differ diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/wood.png b/Resources/Textures/Objects/Tiles/tile.rsi/wood.png index c862398894..61881421e4 100644 Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/wood.png and b/Resources/Textures/Objects/Tiles/tile.rsi/wood.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png new file mode 100644 index 0000000000..e00bac61a5 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png new file mode 100644 index 0000000000..6857f2a241 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png new file mode 100644 index 0000000000..904395ea40 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png new file mode 100644 index 0000000000..c78d01c42d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png new file mode 100644 index 0000000000..95c4cf190b Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png new file mode 100644 index 0000000000..2a71f76d5d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json new file mode 100644 index 0000000000..9a14300b5e --- /dev/null +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json @@ -0,0 +1,186 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + } + ] +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png new file mode 100644 index 0000000000..862c9940fc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png new file mode 100644 index 0000000000..753e1e8a9e Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png new file mode 100644 index 0000000000..84933bd5ed Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png new file mode 100644 index 0000000000..db7be0bc4a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png new file mode 100644 index 0000000000..24eb2aedc2 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png new file mode 100644 index 0000000000..fc90acd637 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png new file mode 100644 index 0000000000..fb5d774588 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png new file mode 100644 index 0000000000..f16a028dee Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png new file mode 100644 index 0000000000..630eabb976 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png new file mode 100644 index 0000000000..a0040dfdc7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png index a0f54eb2dc..9aaf1f688f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png index ed6d7bb883..e171ad6aea 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/locked.png deleted file mode 100644 index c25c8ba1fa..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png index e8242e7c8e..5dff6a5e50 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png index d3c0d9d004..bdd0150cf1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/spark.png deleted file mode 100644 index dfe3e94b66..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png index eadf01f19b..36df88f44c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png index 3a05a9ab7b..5ec7f63312 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/locked.png deleted file mode 100644 index ad0ad1975b..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png index e8242e7c8e..c771279653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png index 04ffcc8036..f8dfecba63 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/spark.png deleted file mode 100644 index 1cab1a9349..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png index 63cb88d61c..efddf7ff2e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png index 1f00e0b70b..fe9268a1de 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/locked.png deleted file mode 100644 index 1b5b19d26a..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png index e8242e7c8e..09fec38bfa 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png index a19e9c54fb..d5db1fa7de 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/spark.png deleted file mode 100644 index 682a255e5b..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png new file mode 100644 index 0000000000..c1984c4f00 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png new file mode 100644 index 0000000000..2d854b6b48 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png new file mode 100644 index 0000000000..6e3cb09bcf Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png new file mode 100644 index 0000000000..54938d9b3b Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png new file mode 100644 index 0000000000..351a0f3528 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny.png new file mode 100644 index 0000000000..0eaf4064c7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json new file mode 100644 index 0000000000..24cd01570b --- /dev/null +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json @@ -0,0 +1,159 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.3 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.6 + ] + ] + }, + { + "name": "deny", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open" + }, + { + "name": "opening", + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.3 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open" + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + } + ] +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png new file mode 100644 index 0000000000..1868e6ccac Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png new file mode 100644 index 0000000000..ec42792e4b Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png new file mode 100644 index 0000000000..351a0f3528 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png new file mode 100644 index 0000000000..86838a6000 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png new file mode 100644 index 0000000000..33ef420933 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png new file mode 100644 index 0000000000..bf857f1c12 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png new file mode 100644 index 0000000000..834fc74519 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png new file mode 100644 index 0000000000..2dba392369 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png new file mode 100644 index 0000000000..2dba392369 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png new file mode 100644 index 0000000000..e5d876f7ed Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png new file mode 100644 index 0000000000..a0b9e23d40 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly-fill.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly-fill.png new file mode 100644 index 0000000000..622e0de7a5 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly-fill.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly-glass.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly-glass.png new file mode 100644 index 0000000000..9ff21ca1b7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly-glass.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png index 84ece07480..5e2dae4c26 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-empty.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-empty.png new file mode 100644 index 0000000000..da6476fba6 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-empty.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-fill.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-fill.png new file mode 100644 index 0000000000..f5764f5f33 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-fill.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-glass.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-glass.png new file mode 100644 index 0000000000..0d743b2d68 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed-glass.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png index 8bf5be18bc..d5243ea857 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-empty.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-empty.png new file mode 100644 index 0000000000..48c66cf924 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-empty.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-fill.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-fill.png new file mode 100644 index 0000000000..c27c80657d Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-fill.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-glass.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-glass.png new file mode 100644 index 0000000000..64bcb035c6 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-glass.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png new file mode 100644 index 0000000000..64d41f1dba Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png index f974522f19..f48efb153a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png index 6120c6089a..b835f51158 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny.png new file mode 100644 index 0000000000..a3a6eb30a5 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png new file mode 100644 index 0000000000..a0c0a88c66 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/locked.png deleted file mode 100644 index 095929aa72..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json index 3ee302f219..27e3c7714f 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -11,19 +11,28 @@ "name": "assembly" }, { - "name": "bolted_unlit" + "name": "assembly-fill" }, { - "name": "locked" + "name": "assembly-glass" + }, + { + "name": "bolted_unlit" }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" + }, + { + "name": "closed-fill" + }, + { + "name": "closed-glass" + }, + { + "name": "panel_closed" }, { "name": "closing", @@ -34,8 +43,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,17 +51,56 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "closing-fill", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing-glass", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing-panel", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny", "delays": [ [ 0.1, @@ -63,9 +109,21 @@ ] ] }, + { + "name": "emergency_unlit", + "delays": [ + [ + 12, + 12 + ] + ] + }, { "name": "open" }, + { + "name": "panel_open" + }, { "name": "opening", "delays": [ @@ -75,8 +133,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,12 +146,12 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, { - "name": "panel_closing", + "name": "opening-fill", "delays": [ [ 0.1, @@ -103,30 +159,38 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 - ] - ] - }, - { - "name": "panel_open" - }, - { - "name": "panel_opening", - "delays": [ - [ - 0.2, - 0.07, - 0.07, - 0.07, - 0.07, - 0.07, 0.2 ] ] }, { - "name": "spark", + "name": "opening-glass", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening-panel", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png index e8242e7c8e..de9c757173 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-empty.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-empty.png new file mode 100644 index 0000000000..867e8dd1fd Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-empty.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-fill.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-fill.png new file mode 100644 index 0000000000..e176980142 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-fill.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-glass.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-glass.png new file mode 100644 index 0000000000..a48b154c95 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-glass.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png new file mode 100644 index 0000000000..6d3267c174 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png index 03bc606edb..594f26a450 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png index 846e50ff8e..b4ca46e425 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png new file mode 100644 index 0000000000..7fe48cc120 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closing.png deleted file mode 100644 index 1a612bfdde..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closing.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png index 777c6dd693..2603c4a720 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_opening.png deleted file mode 100644 index 3679c4821d..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_opening.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/spark.png deleted file mode 100644 index 2bc0c7eb75..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png new file mode 100644 index 0000000000..e76a54328a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png index 7bdc0c7c65..3f3f14b078 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png index 0c62ce2d7f..821f747fb2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png index 5b656f891b..64683f81db 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/locked.png deleted file mode 100644 index 190f3c6012..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png index e8242e7c8e..acb4476002 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png index dd15597351..1c15ed06bc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/spark.png deleted file mode 100644 index b82e0b28c7..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png index ebba1934f1..25e49243e3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png index 09465ba197..de51df7090 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/locked.png deleted file mode 100644 index 6a8b3317bf..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png index e8242e7c8e..d4bf47c8eb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png index 5941dc77c0..23a25748a8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/spark.png deleted file mode 100644 index 494a0ad8b7..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png index 68f5045e80..789b3537c0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png index e5c94c9bcd..90e3917603 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/locked.png deleted file mode 100644 index 68243169fe..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png index e8242e7c8e..93c4460f1b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png index f004d63f0f..0a6a79329e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/spark.png deleted file mode 100644 index 16be3a78fe..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png index 08229edfeb..d61b8f17f0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png index e765cdcccd..d61b8f17f0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png index 3de2c00f38..247612bd7e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/locked.png deleted file mode 100644 index 90293273b3..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png index e8242e7c8e..862c9940fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png index 6cd6b4dcb9..cded9299eb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/spark.png deleted file mode 100644 index d21ba61661..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png index baed65f051..01ddc9fef0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png index e5b7a7dc69..9e9e14d1bd 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/locked.png deleted file mode 100644 index c9d8656c39..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png index e8242e7c8e..5dff6a5e50 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png index ec2e4c7c68..94b0291a5b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/spark.png deleted file mode 100644 index 6e0a6a0ddb..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png index 8a91874780..96349c2a29 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png index 9540b1771f..2a861fa8a4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/locked.png deleted file mode 100644 index 0c38b4632c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png index e8242e7c8e..c771279653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png index 830a75e799..edcf9d92cc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/spark.png deleted file mode 100644 index 07e562e117..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png index 03158b6f7c..b409f80c52 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png index 93f959bb56..c27f6aad6f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/locked.png deleted file mode 100644 index 1b48c797d8..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png index e8242e7c8e..09fec38bfa 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png index b09abcd3a0..47dee90e59 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/spark.png deleted file mode 100644 index ac19ccfb79..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png index f2310f39e7..c1984c4f00 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png index 3948da30d0..6699ff8154 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png index f0d596f4be..6e3cb09bcf 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png index e51c63a609..f8d6f1e29e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png index 960d772d57..351a0f3528 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny.png new file mode 100644 index 0000000000..0eaf4064c7 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png deleted file mode 100644 index 4aaaebadf5..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/locked.png deleted file mode 100644 index 03c6bd650a..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json index f12b801297..24cd01570b 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json @@ -1,17 +1,17 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "closed" + "name": "bolted_unlit" }, { - "name": "locked" + "name": "closed" }, { "name": "closed_unlit" @@ -25,7 +25,6 @@ 0.1, 0.1, 0.1, - 0.1, 0.3 ] ] @@ -34,15 +33,12 @@ "name": "closing_unlit", "delays": [ [ - 0.6, - 0.1, - 0.1, - 0.3 + 0.6 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ 0.1, @@ -51,37 +47,6 @@ ] ] }, - { - "name": "bolted_unlit" - }, - { - "name": "panel_closing", - "delays": [ - [ - 0.2, - 0.2, - 0.1, - 0.1, - 0.1, - 0.1, - 0.3 - ] - ] - }, - { - "name": "panel_opening", - "delays": [ - [ - 0.2, - 0.2, - 0.1, - 0.1, - 0.1, - 0.1, - 0.3 - ] - ] - }, { "name": "open" }, @@ -94,7 +59,6 @@ 0.1, 0.1, 0.1, - 0.1, 0.3 ] ] @@ -103,10 +67,20 @@ "name": "opening_unlit", "delays": [ [ - 0.2, - 0.2, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ 0.1, - 0.6 + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -114,9 +88,23 @@ "name": "panel_open" }, { - "name": "spark", + "name": "panel_opening", "delays": [ [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, 0.1, 0.1, 0.1, @@ -133,6 +121,7 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] @@ -158,6 +147,7 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png index fa4ee84e7a..1868e6ccac 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png index 7d3e4642cc..be4300f51c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png index aab9a1dff6..351a0f3528 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png index cbeab4e4a3..86838a6000 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png index aece7eda1b..33ef420933 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png index 18ebbb777e..bf857f1c12 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/spark.png deleted file mode 100644 index e3294e59fb..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png new file mode 100644 index 0000000000..834fc74519 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png index 247e01da3d..a0b9e23d40 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png index aba21d5ef5..10168bf762 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png index a0bcd0e796..8c1c28521d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/locked.png deleted file mode 100644 index 82e703c1e9..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png index e8242e7c8e..2523b36382 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png index e8af6a1d16..00f2c629b9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/spark.png deleted file mode 100644 index 3663fc0cf0..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png index 01f19f9a01..9035162d43 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png index dd3f170aac..d207ec7d21 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/locked.png deleted file mode 100644 index f5593718e7..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png index e8242e7c8e..086bedbc60 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png index 68c73a9e99..d6d578a3be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/spark.png deleted file mode 100644 index 4255358ec8..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png index ac5ed46fa7..b228a1487c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png index a35544bd80..a124e930d2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/locked.png deleted file mode 100644 index be0e3286a1..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png index e8242e7c8e..acb4476002 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png index 1e10ea9266..2f25dfe043 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/spark.png deleted file mode 100644 index 308e49cf8d..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png index 40a8d3b93f..5c2f4bb4df 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png index 520067bdc5..ada41f79dc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/locked.png deleted file mode 100644 index a5d6e727e2..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png index e8242e7c8e..d4bf47c8eb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png index 70a8d12707..c5c821ec1b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/spark.png deleted file mode 100644 index 1cac766eac..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png index 0fa52b6b4e..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png index 8db4a22343..4cfd894f74 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png index 1d57c065a7..c78d01c42d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png index 86edfd165f..56ac2b4ead 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png index 6120c6089a..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny.png new file mode 100644 index 0000000000..7c56263f83 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png deleted file mode 100644 index b7af192743..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/locked.png deleted file mode 100644 index 58b5191e59..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json index 3ee302f219..9a14300b5e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,17 +13,11 @@ { "name": "bolted_unlit" }, - { - "name": "locked" - }, { "name": "closed" }, { - "name": "closed_unlit", - "delays": [ - [] - ] + "name": "closed_unlit" }, { "name": "closing", @@ -34,8 +28,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -44,19 +36,22 @@ "name": "closing_unlit", "delays": [ [ - 0.25, + 0.1, + 0.1, 0.07, 0.07, 0.07, - 0.07, - 0.15 + 0.2 ] ] }, { - "name": "deny_unlit", + "name": "deny", "delays": [ [ + 0.1, + 0.1, + 0.1, 0.1, 0.1, 0.1 @@ -64,7 +59,12 @@ ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -75,8 +75,6 @@ 0.07, 0.07, 0.07, - 0.07, - 0.07, 0.2 ] ] @@ -90,7 +88,7 @@ 0.07, 0.07, 0.07, - 0.25 + 0.2 ] ] }, @@ -103,21 +101,24 @@ 0.07, 0.07, 0.07, - 0.07, - 0.27 + 0.2 ] ] }, { - "name": "panel_open" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ - 0.2, - 0.07, - 0.07, + 0.1, + 0.1, 0.07, 0.07, 0.07, @@ -126,7 +127,7 @@ ] }, { - "name": "spark", + "name": "sparks", "delays": [ [ 0.1, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png index e8242e7c8e..93c4460f1b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png index 7a6277afd3..a9f90c4553 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png index 846e50ff8e..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png index 1a612bfdde..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png index 777c6dd693..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png index 3679c4821d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/spark.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/spark.png deleted file mode 100644 index ed2b238f45..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png new file mode 100644 index 0000000000..dd67e88a31 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png index 7bdc0c7c65..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/full.png deleted file mode 100644 index b48e8c584d..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_0.png deleted file mode 100644 index 5f16e1db43..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_1.png deleted file mode 100644 index 5e910180b7..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_2.png deleted file mode 100644 index 5f16e1db43..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_3.png deleted file mode 100644 index 935fddc5aa..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_4.png deleted file mode 100644 index 9b2bd59d6e..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_5.png deleted file mode 100644 index 948e0b6f9e..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_6.png deleted file mode 100644 index 10b077dd7f..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_6.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_7.png deleted file mode 100644 index c46b548aa3..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/state_7.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png index cf5f11fd37..f57395c659 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png index 6c73fc4338..f3631cfc0e 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png index cf5f11fd37..f57395c659 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png index 6c73fc4338..f3631cfc0e 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png index 6fdab3eca4..a8d469a32f 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png index 2494a9b04a..6cbcfa1bef 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png index 6fdab3eca4..a8d469a32f 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png index 8f535b4a1e..29bd4db74b 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/carpet.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png index 4f931059e8..41b2c199d1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png index 55c7c54235..47ab5fc187 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png index cd2e6ea711..3e78a2531b 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png index 55c7c54235..47ab5fc187 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png index cd2e6ea711..3e78a2531b 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png index adcf8d2fec..f4f9168b07 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png index e8f375236d..0046d10029 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png index adcf8d2fec..f4f9168b07 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png index 2567c9a581..165f578dc0 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/generic.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png index b1a6f7af56..4c394c4650 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png index c56fc692ef..2ed3dbb4c0 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png index def9941b86..f63429f102 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png index c56fc692ef..2ed3dbb4c0 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png index def9941b86..f63429f102 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png index 9bdc4d9edd..71d87be2d1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png index 99eefcc2f9..74794bbf34 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png index 9bdc4d9edd..71d87be2d1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png index 9fe2dddd3f..ecdf387b8f 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/glass.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/full.png deleted file mode 100644 index 788ab0449f..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/full.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/meta.json deleted file mode 100644 index 0ebc40b814..0000000000 --- a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/meta.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", - "states": [ - { - "name": "full", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "state_0", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_1", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_2", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_3", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_4", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_5", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_6", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "state_7", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] -} diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_0.png deleted file mode 100644 index 1ce13cbd08..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_0.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_1.png deleted file mode 100644 index 874901ded5..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_2.png deleted file mode 100644 index 1ce13cbd08..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_3.png deleted file mode 100644 index 874901ded5..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_4.png deleted file mode 100644 index 68a4eedeb2..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_5.png deleted file mode 100644 index bc7553d53f..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_6.png deleted file mode 100644 index 68a4eedeb2..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_6.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_7.png deleted file mode 100644 index 210e315508..0000000000 Binary files a/Resources/Textures/Structures/Furniture/Tables/metal.rsi/state_7.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png new file mode 100644 index 0000000000..7345eb6591 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/bar.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/meta.json similarity index 100% rename from Resources/Textures/Structures/Furniture/Tables/bar.rsi/meta.json rename to Resources/Textures/Structures/Furniture/Tables/plasma.rsi/meta.json diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png new file mode 100644 index 0000000000..a8791e01c1 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png new file mode 100644 index 0000000000..4e04182a05 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png new file mode 100644 index 0000000000..a8791e01c1 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png new file mode 100644 index 0000000000..4e04182a05 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png new file mode 100644 index 0000000000..230838bfc6 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png new file mode 100644 index 0000000000..2da0cebb25 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png new file mode 100644 index 0000000000..230838bfc6 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png new file mode 100644 index 0000000000..82880b87ad Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/plasma.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png index 27476ab819..19dec0a984 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png index c0aba081f5..1e061724e1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png index 71c3977bce..428ae7c3e1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png index c0aba081f5..1e061724e1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png index 71c3977bce..428ae7c3e1 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png index 1fb8889f58..a822918179 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png index 776c50ed64..f57b63ecac 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png index 1fb8889f58..a822918179 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png index f50c327058..52bb74a0da 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png index 622e64d622..e4c06d9d8f 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/full.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json index 0ebc40b814..667cf5efc1 100644 --- a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/meta.json @@ -1,163 +1,46 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/a138859aec54b20dac65eb76e94e9db1b2202f55 and modified by Swept", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/tables.dmi", "states": [ { - "name": "full", - "delays": [ - [ - 1 - ] - ] + "name": "full" }, { "name": "state_0", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "state_1", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "state_2", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "state_3", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "state_4", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "state_5", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "state_6", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "state_7", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png index 137b4602c8..1e93bd9a76 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_0.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png index 6124d549a7..7e03504066 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_1.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png index 137b4602c8..1e93bd9a76 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_2.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png index 6124d549a7..7e03504066 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_3.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png index 21c8b22132..9421e66126 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_4.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png index ddf03a7cdb..679bcc34ae 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_5.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png index 21c8b22132..9421e66126 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_6.png differ diff --git a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png index bec17213a8..87f2e5da7c 100644 Binary files a/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png and b/Resources/Textures/Structures/Furniture/Tables/wood.rsi/state_7.png differ diff --git a/Resources/Textures/Structures/Furniture/bookshelf.rsi/empty.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/empty.png new file mode 100644 index 0000000000..0eecd1a48a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/bookshelf.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Furniture/bookshelf.rsi/meta.json b/Resources/Textures/Structures/Furniture/bookshelf.rsi/meta.json index f4ce0ae183..a80f2a8141 100644 --- a/Resources/Textures/Structures/Furniture/bookshelf.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/bookshelf.rsi/meta.json @@ -10,6 +10,13 @@ { "name": "base" }, + { + "name": "empty" + }, + { + "name": "smooth", + "directions": 4 + }, { "name": "book-0" }, diff --git a/Resources/Textures/Structures/Furniture/bookshelf.rsi/smooth.png b/Resources/Textures/Structures/Furniture/bookshelf.rsi/smooth.png new file mode 100644 index 0000000000..3b7da33eb9 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/bookshelf.rsi/smooth.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/bar-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/bar-knocked.png new file mode 100644 index 0000000000..b00aa4f698 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/bar-knocked.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/bar.png b/Resources/Textures/Structures/Furniture/chairs.rsi/bar.png new file mode 100644 index 0000000000..19273f26d8 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/bar.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale-knocked.png new file mode 100644 index 0000000000..be896ab2e7 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale-knocked.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale.png new file mode 100644 index 0000000000..1bf59240fb Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-knocked.png new file mode 100644 index 0000000000..6c949027a6 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-knocked.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair.png new file mode 100644 index 0000000000..945f836dd5 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/chair.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/comfy-overlay.png b/Resources/Textures/Structures/Furniture/chairs.rsi/comfy-overlay.png new file mode 100644 index 0000000000..97f7a5a222 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/comfy-overlay.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/comfy.png b/Resources/Textures/Structures/Furniture/chairs.rsi/comfy.png new file mode 100644 index 0000000000..2f6c9c525c Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/comfy.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json new file mode 100644 index 0000000000..58476ab5d1 --- /dev/null +++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json @@ -0,0 +1,79 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bar", + "directions": 4 + }, + { + "name": "bar-knocked", + "directions": 4 + }, + { + "name": "chair", + "directions": 4 + }, + { + "name": "chair-knocked", + "directions": 4 + }, + { + "name": "chair-greyscale", + "directions": 4 + }, + { + "name": "chair-greyscale-knocked", + "directions": 4 + }, + { + "name": "comfy", + "directions": 4 + }, + { + "name": "comfy-overlay", + "directions": 4 + }, + { + "name": "office-dark", + "directions": 4 + }, + { + "name": "office-white", + "directions": 4 + }, + { + "name": "shuttle", + "directions": 4 + }, + { + "name": "shuttle-overlay", + "directions": 4 + }, + { + "name": "stool", + "directions": 4 + }, + { + "name": "stool-knocked", + "directions": 4 + }, + { + "name": "wooden", + "directions": 4 + }, + { + "name": "wooden-wings", + "directions": 4 + }, + { + "name": "wooden-wings-knocked", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/office-dark.png b/Resources/Textures/Structures/Furniture/chairs.rsi/office-dark.png new file mode 100644 index 0000000000..4fe4b7301a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/office-dark.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/office-white.png b/Resources/Textures/Structures/Furniture/chairs.rsi/office-white.png new file mode 100644 index 0000000000..3e71e29766 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/office-white.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/shuttle-overlay.png b/Resources/Textures/Structures/Furniture/chairs.rsi/shuttle-overlay.png new file mode 100644 index 0000000000..bdf2db87c9 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/shuttle-overlay.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/shuttle.png b/Resources/Textures/Structures/Furniture/chairs.rsi/shuttle.png new file mode 100644 index 0000000000..9d1fd9fbbf Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/shuttle.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/stool-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/stool-knocked.png new file mode 100644 index 0000000000..bb8d711187 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/stool-knocked.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/stool.png b/Resources/Textures/Structures/Furniture/chairs.rsi/stool.png new file mode 100644 index 0000000000..5fab4416ae Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/stool.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png new file mode 100644 index 0000000000..efb9b0b915 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png differ diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings.png b/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings.png new file mode 100644 index 0000000000..51c416de8a Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair.png b/Resources/Textures/Structures/Furniture/chairs.rsi/wooden.png similarity index 100% rename from Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair.png rename to Resources/Textures/Structures/Furniture/chairs.rsi/wooden.png diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/armchair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/armchair_preview.png deleted file mode 100644 index e4730e0ad9..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/armchair_preview.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair.png deleted file mode 100644 index 2a2e081db4..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair_over.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair_over.png deleted file mode 100644 index 96f65354bf..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/bar_chair_over.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/bar_stool.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bar_stool.png deleted file mode 100644 index db4e5d185a..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/bar_stool.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/bed_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/bed_padding.png deleted file mode 100644 index 8eea972fc9..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/bed_padding.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair.png deleted file mode 100644 index 01b2c4654b..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/chair.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/chair_armrest.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_armrest.png deleted file mode 100644 index 446129c3ea..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/chair_armrest.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding.png deleted file mode 100644 index 789730c7c6..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding_over.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding_over.png deleted file mode 100644 index 67b146e422..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/chair_padding_over.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/chair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/chair_preview.png deleted file mode 100644 index b69285ce93..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/chair_preview.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/comfychair_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/comfychair_preview.png deleted file mode 100644 index 3b8db59603..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/comfychair_preview.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/mattress.png b/Resources/Textures/Structures/Furniture/furniture.rsi/mattress.png new file mode 100644 index 0000000000..f4efb44cb3 Binary files /dev/null and b/Resources/Textures/Structures/Furniture/furniture.rsi/mattress.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json index d5f8e597ab..3484714552 100644 --- a/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/furniture.rsi/meta.json @@ -1,106 +1,17 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "armchair_preview", - "directions": 4 - }, - { - "name": "bar_chair", - "directions": 4 - }, - { - "name": "bar_chair_over", - "directions": 4 - }, - { - "name": "bar_stool" - }, { "name": "bed" }, { - "name": "chair", - "directions": 4 - }, - { - "name": "chair_armrest", - "directions": 4 - }, - { - "name": "chair_padding", - "directions": 4 - }, - { - "name": "chair_padding_over", - "directions": 4 - }, - { - "name": "chair_preview", - "directions": 4 - }, - { - "name": "comfychair_preview", - "directions": 4 - }, - { - "name": "officechair_dark", - "directions": 4 - }, - { - "name": "officechair_white", - "directions": 4 - }, - { - "name": "psychbed" - }, - { - "name": "psychbed_padding" - }, - { - "name": "shuttle_chair", - "directions": 4 - }, - { - "name": "stool_base" - }, - { - "name": "stool_padded_preview" - }, - { - "name": "stool_padding" - }, - { - "name": "stool_preview" - }, - { - "name": "w_overlay", - "directions": 4 - }, - { - "name": "wheelchair", - "directions": 4 - }, - { - "name": "wheelchair_folded", - "directions": 4 - }, - { - "name": "wooden_chair", - "directions": 4 - }, - { - "name": "wooden_chair_wings", - "directions": 4 - }, - { - "name": "shelf" + "name": "mattress" }, { "name": "rack" diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_dark.png b/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_dark.png deleted file mode 100644 index 71868ec609..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_dark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_white.png b/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_white.png deleted file mode 100644 index e4897b859f..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/officechair_white.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png b/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png deleted file mode 100644 index 845c36c822..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed_padding.png deleted file mode 100644 index aaeb67b2b5..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/psychbed_padding.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png b/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png index e52e97148e..b299cc49e1 100644 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png and b/Resources/Textures/Structures/Furniture/furniture.rsi/rack.png differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/shelf.png b/Resources/Textures/Structures/Furniture/furniture.rsi/shelf.png deleted file mode 100644 index 5404fb8e9d..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/shelf.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/shuttle_chair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/shuttle_chair.png deleted file mode 100644 index 3f939ab2fb..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/shuttle_chair.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/stool_base.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_base.png deleted file mode 100644 index eafe301abd..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/stool_base.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padded_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padded_preview.png deleted file mode 100644 index 867c6964a4..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padded_preview.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padding.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padding.png deleted file mode 100644 index 6b31963cca..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/stool_padding.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/stool_preview.png b/Resources/Textures/Structures/Furniture/furniture.rsi/stool_preview.png deleted file mode 100644 index eafe301abd..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/stool_preview.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/w_overlay.png b/Resources/Textures/Structures/Furniture/furniture.rsi/w_overlay.png deleted file mode 100644 index 525f92aefe..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/w_overlay.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair.png deleted file mode 100644 index c2793b7065..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair_folded.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair_folded.png deleted file mode 100644 index 4437cf9507..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/wheelchair_folded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair_wings.png b/Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair_wings.png deleted file mode 100644 index 4e80f617b8..0000000000 Binary files a/Resources/Textures/Structures/Furniture/furniture.rsi/wooden_chair_wings.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/broken.png index b394ea3fbd..dfef5536d4 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/deny-unshaded.png index c6e30865ce..52f43a543f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/meta.json index a358a551ce..9ae88611b2 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/21d5a65346cfdaa61e86410cf9323e4e03a362d9", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/normal-unshaded.png index 17240bfdf9..aeca2e4e3e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/off.png index fe2803b6dc..75c8d114d9 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/panel.png index b0b7e5a0f4..60dbf76b85 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/boozeomat.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png index 590351570b..89d737bb11 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png index c7fa863d4d..30f71b97f2 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png index 161a9f2bfb..af1adcaaf0 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json index e1ffe04acf..83128486b1 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/meta.json @@ -1,14 +1,20 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 0.5, + 0.5 + ] + ] }, { "name": "broken" @@ -17,11 +23,6 @@ "name": "deny-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, 0.1, 0.1 ] diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png index 3e95ed4aa0..35e8707b84 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png index 11f38174a5..20b98097db 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/cart.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/broken.png new file mode 100644 index 0000000000..a5d9db35a2 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/cola-light-mask.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/cola-light-mask.png new file mode 100644 index 0000000000..7a3afbdb73 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/cola-light-mask.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/deny-unshaded.png new file mode 100644 index 0000000000..0a5ff43f0c Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/eject-unshaded.png new file mode 100644 index 0000000000..9efb08705f Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/meta.json new file mode 100644 index 0000000000..122f479d49 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 1.5, + 0.1, + 2.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal-unshaded.png new file mode 100644 index 0000000000..96ee10550b Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal.png new file mode 100644 index 0000000000..79b6a6e4c6 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/off.png new file mode 100644 index 0000000000..31f66705ba Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/panel.png new file mode 100644 index 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/cola-black.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png index bf478bada1..6c296eb7b6 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png index 5450574f55..0a5ff43f0c 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png index 0c39a51203..9efb08705f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json index 6c3db20d43..3f7f1d8a0a 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/meta.json @@ -1,14 +1,22 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] }, { "name": "broken" diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png index 5a4eb5ccbd..96ee10550b 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal.png index 0290132906..ba64138260 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png index 319189dbe7..acc26679bd 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png index 757e802cec..9e3049e07d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/cola.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png index 8831382360..0f9501592a 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png index 2fd223d6f4..73678935bc 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json index 64d7c7e94a..695c3fe716 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -15,20 +15,34 @@ "delays": [ [ 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, + 0.7, 0.1 ] ] }, { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] }, { "name": "off" diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png index 22f242b7dd..5625997714 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png index 9553d5135f..dc61f221c0 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png new file mode 100644 index 0000000000..80912168e4 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/dinnerware.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png index c5ec97becf..cfd081cf6b 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png index 03c3bb39ec..45c7eb91c2 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png index dc5931f654..99c7cfeea1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json index 6df73619fe..35b29c7356 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "deny-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, 0.1, 0.1 ] @@ -29,12 +25,22 @@ [ 0.1, 0.4, + 0.2, + 0.4, 0.1 ] ] }, { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] }, { "name": "off" diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png index bbf5692ec9..d9f4a8ab47 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png index da55bc32d0..b38fbe4133 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png index aa44ed2e9f..faddc53351 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/engivend.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png index 6f7a130202..a6e60a2352 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png index 96403be7cf..7c72182485 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png index a4fd4d3258..6c7cf1038d 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json index 2c61f1ce8c..3035a0a0c8 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/meta.json @@ -1,14 +1,20 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 0.5, + 0.5 + ] + ] }, { "name": "broken" @@ -17,10 +23,6 @@ "name": "deny-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, 0.1, 0.1 ] diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png index 8e1e181e13..5cafc8e3a4 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png index 36707c738a..bc342677ab 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png index 2200c34848..a797b42b18 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/medical.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png index 86feb557c8..265c20ed44 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png index e507e6960f..51bcf34dc3 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png index 88699f866a..c49dc97d28 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json index 02a78e6548..35b29c7356 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/nutri.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/7c41613c521b6fab647ae98e1283f86b3cef382a", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -11,32 +11,42 @@ "name": "broken" }, { - "name": "deny-unshaded" - }, - { - "name": "eject-unshaded", + "name": "deny-unshaded", "delays": [ [ - 1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.5, - 0.1, - 1, - 0.1, - 0.1, 0.1, 0.1 ] ] }, { - "name": "normal-unshaded" + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.2, + 0.4, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] }, { "name": "off" + }, + { + "name": "panel" } ] } diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png index 783cbaa6e3..275180babf 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png index 74bf182621..f7a48db210 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png new file mode 100644 index 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/nutri.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png index 922173d726..3e35e625af 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png index afb46c2fac..af909e262f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/eject-unshaded.png new file mode 100644 index 0000000000..018af16ab2 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json index 4b69aa785a..46777f0c12 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/meta.json @@ -1,50 +1,41 @@ { "version": 1, - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.2, + 0.4, + 0.1 + ] + ] }, { "name": "deny-unshaded", "delays": [ [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.3, 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.3, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 + 0.1 ] ] }, diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png index c40d6dbab9..9225854c7a 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png index 7a8fc64b09..40a5993aae 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png index 5e88a32c0c..a797b42b18 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/sec.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png index 78fee67e75..883a4a70e6 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png new file mode 100644 index 0000000000..da34b0b104 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png index 67483d624e..630ea5a1d0 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json index ead3f0ed80..35b29c7356 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/seeds.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/7c41613c521b6fab647ae98e1283f86b3cef382a", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -11,27 +11,42 @@ "name": "broken" }, { - "name": "eject-unshaded", + "name": "deny-unshaded", "delays": [ [ - 0.1, - 0.2, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 1, 0.1, 0.1 ] ] }, { - "name": "normal-unshaded" + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.2, + 0.4, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] }, { "name": "off" + }, + { + "name": "panel" } ] } diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png index 7cc9cf08dc..8182e6a2c7 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png index 1bf7751241..3ab3fec281 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png new file mode 100644 index 0000000000..9e3049e07d Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/seeds.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png index fbeb65414c..863e8d899c 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png new file mode 100644 index 0000000000..c81ec5a929 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png new file mode 100644 index 0000000000..92b816012c Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png new file mode 100644 index 0000000000..6faae75bb7 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png new file mode 100644 index 0000000000..0a0a4a7703 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png new file mode 100644 index 0000000000..4a81949abd Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json index 9c0fd5f6f3..2abbac687f 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json @@ -1,20 +1,62 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/21d5a65346cfdaa61e86410cf9323e4e03a362d9", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "fill-0" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, { "name": "broken" }, { - "name": "normal-unshaded" + "name": "deny-unshaded", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] }, { "name": "off" + }, + { + "name": "panel" } ] } diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png index 728bda8ad4..3ef544801e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off-real.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off-real.png new file mode 100644 index 0000000000..702e12e908 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off-real.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png index cd5721a4eb..030e453cfb 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png new file mode 100644 index 0000000000..60dbf76b85 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/broken.png new file mode 100644 index 0000000000..dd880d13f1 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/deny-unshaded.png new file mode 100644 index 0000000000..b8221f982e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/eject-unshaded.png new file mode 100644 index 0000000000..49fcef45a1 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/meta.json new file mode 100644 index 0000000000..182a623278 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/normal-unshaded.png new file mode 100644 index 0000000000..f04f2db2af Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/off.png new file mode 100644 index 0000000000..adc514bf79 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/panel.png new file mode 100644 index 0000000000..c60f5c3069 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-blue.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/broken.png new file mode 100644 index 0000000000..1fa91aeb65 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/deny-unshaded.png new file mode 100644 index 0000000000..b8221f982e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/eject-unshaded.png new file mode 100644 index 0000000000..49fcef45a1 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/meta.json new file mode 100644 index 0000000000..182a623278 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/normal-unshaded.png new file mode 100644 index 0000000000..f04f2db2af Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/off.png new file mode 100644 index 0000000000..ea44a7d1d9 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/panel.png new file mode 100644 index 0000000000..c60f5c3069 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-green.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/broken.png new file mode 100644 index 0000000000..16eb2938e7 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/deny-unshaded.png new file mode 100644 index 0000000000..b8221f982e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/eject-unshaded.png new file mode 100644 index 0000000000..49fcef45a1 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/meta.json new file mode 100644 index 0000000000..182a623278 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/normal-unshaded.png new file mode 100644 index 0000000000..f04f2db2af Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/off.png new file mode 100644 index 0000000000..4963991441 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/panel.png new file mode 100644 index 0000000000..c60f5c3069 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-orange.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/broken.png new file mode 100644 index 0000000000..0b45043529 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/deny-unshaded.png new file mode 100644 index 0000000000..b8221f982e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/eject-unshaded.png new file mode 100644 index 0000000000..49fcef45a1 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/meta.json new file mode 100644 index 0000000000..182a623278 --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/meta.json @@ -0,0 +1,52 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/normal-unshaded.png new file mode 100644 index 0000000000..f04f2db2af Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/off.png new file mode 100644 index 0000000000..0a079671cf Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/panel.png new file mode 100644 index 0000000000..c60f5c3069 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/snack-teal.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png index 9142ddaef6..d08a87b760 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png index 5d00b8caff..b8221f982e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png index 26f071948d..49fcef45a1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json index d62304e316..182a623278 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -11,9 +11,9 @@ "name": "normal-unshaded", "delays": [ [ - 0.8, - 0.8, - 0.8 + 2.5, + 0.05, + 3.4 ] ] }, diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png index 10aa4ddb02..f04f2db2af 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png index 119d9a494a..6e0de0cf5a 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png index 119757acb6..c60f5c3069 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/broken.png index 2dea2f52ae..b6b5485aea 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/deny-unshaded.png index 155d490ff6..840140fba7 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/eject-unshaded.png index 27d8062b02..f5616b4668 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/meta.json index 911ec910b0..67d254eb66 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/meta.json @@ -1,14 +1,26 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 3, + 0.1, + 1, + 0.2, + 1, + 3, + 0.1, + 0.2 + ] + ] }, { "name": "broken" @@ -17,8 +29,8 @@ "name": "deny-unshaded", "delays": [ [ - 0.4, - 0.4 + 0.1, + 0.1 ] ] }, diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/normal-unshaded.png index 781ae3dfd1..c502209769 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/off.png index e793b98e14..d6887f9b49 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/panel.png index c3720eb355..da88eb71ef 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/sovietsoda.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/broken.png index 6efd6f3a4f..51832409fb 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject-unshaded.png index c090eec02b..2992d4cb73 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject.png deleted file mode 100644 index adc0d37966..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/meta.json index e80ced870e..4df3652144 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/meta.json @@ -1,14 +1,22 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] }, { "name": "broken" diff --git a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/normal-unshaded.png index 85cd16ec8c..7caf960a4a 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/off.png index c1de348dd4..fb153ae9a9 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/panel.png index 785f93e81b..4c92e1fe2e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/vendomat.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png index 83602e54d5..18322391cc 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png index 10df5c2f12..f55e939d2c 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png index f4378bc950..9d19accfe1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject.png deleted file mode 100644 index f9555b79ab..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json index badab7d1d6..35b29c7356 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", "size": { "x": 32, "y": 32 @@ -14,21 +14,6 @@ "name": "deny-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "eject", - "delays": [ - [ - 0.1, - 0.4, 0.1, 0.1 ] @@ -40,13 +25,22 @@ [ 0.1, 0.4, - 0.1, + 0.2, + 0.4, 0.1 ] ] }, { - "name": "normal-unshaded" + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.05, + 3.4, + 0.05 + ] + ] }, { "name": "off" diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png index b0dab7ee0b..80ca6812f7 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png index ee5c8c46c0..2ac83c2eb8 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png index aa44ed2e9f..faddc53351 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/youtool.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png index 70bcce3905..fbb5e8e458 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png and b/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png index 85a3162add..1683368912 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png index 9266d06092..38c25b8482 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png index b139c87b6e..1683368912 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge-unlit.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge-unlit.png new file mode 100644 index 0000000000..605cccdad2 Binary files /dev/null and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge-unlit.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png index af6b416bdd..8879482f02 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png index 83948d521e..0f744966af 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png index d70edcba71..f7756b834b 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready-unlit.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready-unlit.png new file mode 100644 index 0000000000..fa80cff250 Binary files /dev/null and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready-unlit.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png index 9e33f416c5..d9bc5eb562 100644 Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png differ diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json index 4597e4bbaf..4a2c57618e 100644 --- a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json +++ b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/blob/bbe32606902c90f5290b57d905a3f31b84dc6d7d/icons/obj/pipes/disposal.dmi and modified by DrSmugleaf", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by DrSmugLeaf and Swept", "states": [ { "name": "condisposal", @@ -207,13 +207,7 @@ ] }, { - "name": "dispover-full", - "delays": [ - [ - 0.2, - 0.2 - ] - ] + "name": "dispover-full" }, { "name": "dispover-handle", @@ -748,4 +742,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc-b.png b/Resources/Textures/Structures/Power/apc.rsi/apc-b.png deleted file mode 100644 index 925f8c5ffc..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc-b.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc-spark.png b/Resources/Textures/Structures/Power/apc.rsi/apc-spark.png deleted file mode 100644 index 67437b67d0..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc-spark.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc0.png b/Resources/Textures/Structures/Power/apc.rsi/apc0.png index 7079bad29a..2b42c54935 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc0.png and b/Resources/Textures/Structures/Power/apc.rsi/apc0.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc1-b-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc1-b-nocover.png deleted file mode 100644 index 996a618f3a..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc1-b-nocover.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc1-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc1-nocover.png deleted file mode 100644 index 6e42c824b1..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc1-nocover.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc1.png b/Resources/Textures/Structures/Power/apc.rsi/apc1.png deleted file mode 100644 index 233f75c36c..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc2-b-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc2-b-nocover.png deleted file mode 100644 index c218a439e9..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc2-b-nocover.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc2-nocover.png b/Resources/Textures/Structures/Power/apc.rsi/apc2-nocover.png deleted file mode 100644 index 0dc5cda211..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc2-nocover.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apc2.png b/Resources/Textures/Structures/Power/apc.rsi/apc2.png deleted file mode 100644 index d273c1926f..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apc2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apcemag.png b/Resources/Textures/Structures/Power/apc.rsi/apcemag.png deleted file mode 100644 index 86b58be5fb..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apcemag.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apcewires.png b/Resources/Textures/Structures/Power/apc.rsi/apcewires.png deleted file mode 100644 index 9370aaf7d4..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apcewires.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apcmaint.png b/Resources/Textures/Structures/Power/apc.rsi/apcmaint.png deleted file mode 100644 index 41ef7add2a..0000000000 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apcmaint.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco0-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-0.png index ac4581febb..ba84b7d6db 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco0-0.png and b/Resources/Textures/Structures/Power/apc.rsi/apco0-0.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco0-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-1.png index 4519f53653..61ae057d50 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco0-1.png and b/Resources/Textures/Structures/Power/apc.rsi/apco0-1.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco0-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-2.png index 355a76f926..6cce72f795 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco0-2.png and b/Resources/Textures/Structures/Power/apc.rsi/apco0-2.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco0-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco0-3.png index 27c2a87efd..6cc48bd1a5 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco0-3.png and b/Resources/Textures/Structures/Power/apc.rsi/apco0-3.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco1-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-0.png index c66bfa90d9..b31bed6c6b 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco1-0.png and b/Resources/Textures/Structures/Power/apc.rsi/apco1-0.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco1-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-1.png index 365fef1fe6..3bb505ecb8 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco1-1.png and b/Resources/Textures/Structures/Power/apc.rsi/apco1-1.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco1-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-2.png index dd28cce545..959a05cde0 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco1-2.png and b/Resources/Textures/Structures/Power/apc.rsi/apco1-2.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco1-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco1-3.png index a696818ec1..bd8b013310 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco1-3.png and b/Resources/Textures/Structures/Power/apc.rsi/apco1-3.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco2-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-0.png index 7359d44fb0..0cca860220 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco2-0.png and b/Resources/Textures/Structures/Power/apc.rsi/apco2-0.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco2-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-1.png index ccf7139dfb..5ac134cb54 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco2-1.png and b/Resources/Textures/Structures/Power/apc.rsi/apco2-1.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco2-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-2.png index 1623be3521..56802dc043 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco2-2.png and b/Resources/Textures/Structures/Power/apc.rsi/apco2-2.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco2-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco2-3.png index 0b5501318c..5ebec4feee 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco2-3.png and b/Resources/Textures/Structures/Power/apc.rsi/apco2-3.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco3-0.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-0.png index 9df197cce3..c4c103eeb9 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco3-0.png and b/Resources/Textures/Structures/Power/apc.rsi/apco3-0.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco3-1.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-1.png index 5a09344a3e..67e3b3df19 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco3-1.png and b/Resources/Textures/Structures/Power/apc.rsi/apco3-1.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco3-2.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-2.png index 89c3087474..1739853e2b 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apco3-2.png and b/Resources/Textures/Structures/Power/apc.rsi/apco3-2.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apco3-3.png b/Resources/Textures/Structures/Power/apc.rsi/apco3-3.png new file mode 100644 index 0000000000..be343a987b Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/apco3-3.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apcox-0.png b/Resources/Textures/Structures/Power/apc.rsi/apcox-0.png index e1e3843852..a6c347cfd1 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apcox-0.png and b/Resources/Textures/Structures/Power/apc.rsi/apcox-0.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/apcox-1.png b/Resources/Textures/Structures/Power/apc.rsi/apcox-1.png index 25e86bb9b3..cdc29c019e 100644 Binary files a/Resources/Textures/Structures/Power/apc.rsi/apcox-1.png and b/Resources/Textures/Structures/Power/apc.rsi/apcox-1.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/broken.png b/Resources/Textures/Structures/Power/apc.rsi/broken.png new file mode 100644 index 0000000000..092694c371 Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png new file mode 100644 index 0000000000..2713c5506a Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/meta.json b/Resources/Textures/Structures/Power/apc.rsi/meta.json index d6406feec7..1ca38e53c7 100644 --- a/Resources/Textures/Structures/Power/apc.rsi/meta.json +++ b/Resources/Textures/Structures/Power/apc.rsi/meta.json @@ -1,137 +1,127 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "states": [ - { - "name": "apc-b" - }, - { - "name": "apc-spark", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "apc0" - }, - { - "name": "apc1" - }, - { - "name": "apc1-b-nocover" - }, - { - "name": "apc1-nocover" - }, - { - "name": "apc2" - }, - { - "name": "apc2-b-nocover" - }, - { - "name": "apc2-nocover" - }, - { - "name": "apcemag", - "delays": [ - [ - 0.5, - 0.5 - ] - ] - }, - { - "name": "apcewires" - }, - { - "name": "apcmaint" - }, - { - "name": "apco0-0" - }, - { - "name": "apco0-1" - }, - { - "name": "apco0-2" - }, - { - "name": "apco0-3" - }, - { - "name": "apco1-0" - }, - { - "name": "apco1-1" - }, - { - "name": "apco1-2" - }, - { - "name": "apco1-3" - }, - { - "name": "apco2-0" - }, - { - "name": "apco2-1" - }, - { - "name": "apco2-2" - }, - { - "name": "apco2-3" - }, - { - "name": "apco3-0", - "delays": [ - [ - 1.0, - 2.0 - ] - ] - }, - { - "name": "apco3-1", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.2 - ] - ] - }, - { - "name": "apco3-2", - "delays": [ - [ - 1.0, - 1.0 - ] - ] - }, - { - "name": "apcox-0" - }, - { - "name": "apcox-1" - } - ] + { + "name": "sparks-unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "apc0" + }, + { + "name": "emag-unlit", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "panel" + }, + { + "name": "apco0-0" + }, + { + "name": "apco0-1" + }, + { + "name": "apco0-2" + }, + { + "name": "apco0-3" + }, + { + "name": "apco1-0" + }, + { + "name": "apco1-1" + }, + { + "name": "apco1-2" + }, + { + "name": "apco1-3" + }, + { + "name": "apco2-0" + }, + { + "name": "apco2-1" + }, + { + "name": "apco2-2" + }, + { + "name": "apco2-3" + }, + { + "name": "apco3-0", + "delays": [ + [ + 1, + 2 + ] + ] + }, + { + "name": "apco3-1", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2 + ] + ] + }, + { + "name": "apco3-2", + "delays": [ + [ + 1, + 1 + ] + ] + }, + { + "name": "apco3-3", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "apcox-0" + }, + { + "name": "apcox-1" + } + ] } diff --git a/Resources/Textures/Structures/Power/apc.rsi/panel.png b/Resources/Textures/Structures/Power/apc.rsi/panel.png new file mode 100644 index 0000000000..97f8471f29 Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png new file mode 100644 index 0000000000..212fcb78bf Binary files /dev/null and b/Resources/Textures/Structures/Power/apc.rsi/sparks-unlit.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/meta.json b/Resources/Textures/Structures/Power/smes.rsi/meta.json index 4574ea9b66..e841421f7c 100644 --- a/Resources/Textures/Structures/Power/smes.rsi/meta.json +++ b/Resources/Textures/Structures/Power/smes.rsi/meta.json @@ -1 +1,74 @@ -{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/d1e0161af146835f4fb79d21a6200caa9cc842d0/icons/obj/power.dmi and modified.","size":{"x":32,"y":32},"states":[{"name":"smes","select":[],"flags":{},"directions":1},{"name":"smes-display","select":[],"flags":{},"directions":1,"delays":[[0.2,0.2,0.2,0.2,0.2]]},{"name":"smes-crit","select":[],"flags":{},"directions":1,"delays":[[0.2,0.2,0.2,0.2]]},{"name":"smes-oc0","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-oc1","select":[],"flags":{},"directions":1,"delays":[[0.5,0.5]]},{"name":"smes-oc2","select":[],"flags":{},"directions":1,"delays":[[0.5,0.5]]},{"name":"smes-og1","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-og2","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-og3","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-og4","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-og5","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-op0","select":[],"flags":{},"directions":1,"delays":[[1]]},{"name":"smes-op1","select":[],"flags":{},"directions":1,"delays":[[1,1]]},{"name":"smes-op2","select":[],"flags":{},"directions":1,"delays":[[1]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "smes" + }, + { + "name": "smes-open" + }, + { + "name": "smes-oc0" + }, + { + "name": "smes-oc1", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "smes-oc2", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "smes-og1", + "delays": [ + [ + 1, + 1 + ] + ] + }, + { + "name": "smes-og2" + }, + { + "name": "smes-og3" + }, + { + "name": "smes-og4" + }, + { + "name": "smes-og5" + }, + { + "name": "smes-op0" + }, + { + "name": "smes-op1", + "delays": [ + [ + 1, + 1 + ] + ] + }, + { + "name": "smes-op2" + } + ] +} diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-crit.png b/Resources/Textures/Structures/Power/smes.rsi/smes-crit.png deleted file mode 100644 index 644ab351f1..0000000000 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-crit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-display.png b/Resources/Textures/Structures/Power/smes.rsi/smes-display.png deleted file mode 100644 index 8681ed776d..0000000000 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-display.png and /dev/null differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png index 2dd8b598ef..5579432d3f 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-oc0.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png index 32bfb2c017..d624672613 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-oc1.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png index 32bfb2c017..d624672613 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-oc2.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png index de43a4325e..c65f011a07 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og1.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png index fe80c8d645..0023750405 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og2.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png index 0716a2643b..51df688e4a 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og3.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png index ce6b70e2f0..ceb3db1bc3 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og4.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png b/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png index 5b58c2358d..e6c0c8a2ea 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-og5.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png index 50bdab855c..573b5c404f 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-op0.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png index ec45e860a8..f5c8e10489 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-op1.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png b/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png index eb2e2ff6ff..af560237f1 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png and b/Resources/Textures/Structures/Power/smes.rsi/smes-op2.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes-open.png b/Resources/Textures/Structures/Power/smes.rsi/smes-open.png new file mode 100644 index 0000000000..472e3fd720 Binary files /dev/null and b/Resources/Textures/Structures/Power/smes.rsi/smes-open.png differ diff --git a/Resources/Textures/Structures/Power/smes.rsi/smes.png b/Resources/Textures/Structures/Power/smes.rsi/smes.png index 8c63a20ba6..ecfbc4cd58 100644 Binary files a/Resources/Textures/Structures/Power/smes.rsi/smes.png and b/Resources/Textures/Structures/Power/smes.rsi/smes.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png index f10246f250..b44e814ffa 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png index 14edf57a5e..1ba972629a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/burned.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png index 2b8c7667fe..01b6e79d75 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png index 027251020c..ababfbfe92 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/off.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png index 8a553f8d3a..01b6e79d75 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_small.rsi/on.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png index 99316a1756..1565cdc86d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png index 2f73f8b035..7e14e2c2b3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png index 87de42c0e5..5ead53beb0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png index 20182b3ab5..0a2e1ae76b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/off.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png index dd59607b21..6b9758914a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/on.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/broken.png new file mode 100644 index 0000000000..43ec5d64c0 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/burned.png new file mode 100644 index 0000000000..70c53f12ca Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/burned.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/emergency.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/emergency.png new file mode 100644 index 0000000000..e12e07f1a8 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/emergency.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/empty.png new file mode 100644 index 0000000000..e37c866f75 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/meta.json new file mode 100644 index 0000000000..37d22e642a --- /dev/null +++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken", + "directions": 4 + }, + { + "name": "burned", + "directions": 4 + }, + { + "name": "emergency", + "directions": 4 + }, + { + "name": "empty", + "directions": 4 + }, + { + "name": "off", + "directions": 4 + }, + { + "name": "on", + "directions": 4 + }, + { + "name": "on_unlit", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/off.png new file mode 100644 index 0000000000..253d3b4e3f Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/off.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on.png new file mode 100644 index 0000000000..af0150728e Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on_unlit.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on_unlit.png new file mode 100644 index 0000000000..1ef9dd18c7 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on_unlit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/construct.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/construct.png deleted file mode 100644 index 57c77a87c8..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/construct.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/empty.png deleted file mode 100644 index eb00244b41..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/empty.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/meta.json deleted file mode 100644 index 7b4bde4275..0000000000 --- a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"on","select":[],"flags":{},"directions":4},{"name":"off","select":[],"flags":{},"directions":4},{"name":"construct","select":[],"flags":{},"directions":4},{"name":"empty","select":[],"flags":{},"directions":4}]} \ No newline at end of file diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/off.png deleted file mode 100644 index 147fc5221c..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/on.png deleted file mode 100644 index fe646af754..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/lighting.rsi/on.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/full.png b/Resources/Textures/Structures/Walls/solid.rsi/full.png index ff0bdc22d7..02ae3ff3cc 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/full.png and b/Resources/Textures/Structures/Walls/solid.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json index af950638ae..85b809570d 100644 --- a/Resources/Textures/Structures/Walls/solid.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/solid.rsi/meta.json @@ -43,244 +43,66 @@ "directions": 4 }, { - "name": "reinf_construct-0", - "delays": [ - [ - 1 - ] - ] + "name": "reinf_construct-0" }, { - "name": "reinf_construct-1", - "delays": [ - [ - 1 - ] - ] + "name": "reinf_construct-1" }, { - "name": "reinf_construct-2", - "delays": [ - [ - 1 - ] - ] + "name": "reinf_construct-2" }, { - "name": "reinf_construct-3", - "delays": [ - [ - 1 - ] - ] + "name": "reinf_construct-3" }, { - "name": "reinf_construct-4", - "delays": [ - [ - 1 - ] - ] + "name": "reinf_construct-4" }, { - "name": "reinf_construct-5", - "delays": [ - [ - 1 - ] - ] + "name": "reinf_construct-5" }, { - "name": "reinf_cult", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "reinf_metal", - "delays": [ - [ - 1 - ] - ] - }, - { - "name": "reinf_over", - "delays": [ - [ - 1 - ] - ] + "name": "reinf_cult" }, { "name": "reinf_over0", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "reinf_over1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "reinf_over2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "reinf_over3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "reinf_over4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "reinf_over5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "reinf_over6", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "reinf_over7", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { - "name": "rgeneric", - "delays": [ - [ - 1 - ] - ] + "name": "rgeneric" }, { - "name": "wall_girder", - "delays": [ - [ - 1 - ] - ] + "name": "wall_girder" }, { - "name": "reinforced_wall_girder", - "delays": [ - [ - 1 - ] - ] + "name": "reinforced_wall_girder" } ] } diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png index ce2e78e01e..828730d9f3 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png index 79dfd001ce..93e381adf2 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png index 31364cdb3c..cf8936fdce 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png index 40eea5344c..ee44f0d400 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png index fdd114ee1f..bf9dad0013 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png index 9a9180b773..be5832d69d 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_metal.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_metal.png deleted file mode 100644 index 6e4b5179c7..0000000000 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_metal.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over.png deleted file mode 100644 index f7175ea7e6..0000000000 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over.png and /dev/null differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png index cd6fde9a30..8141637bd6 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png index a6278861f0..6f2bcb665a 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png index cd6fde9a30..8141637bd6 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png index a6278861f0..6f2bcb665a 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png index 5b3dd1a524..3fe7b22905 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png index 765dae5a0c..0bd4de7c17 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png index 5b3dd1a524..3fe7b22905 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png index 6d2f9044ac..c8bc3191d3 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png index 7934e6a9aa..665f36c54e 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png and b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png index 48d8a534c7..fe570c054f 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png index a04f2ea6b4..4374ed1e10 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png index 48d8a534c7..fe570c054f 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png index a04f2ea6b4..4374ed1e10 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png index 6fc90a4154..95e4089479 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png index bb0d903bab..d4f50d419f 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png index 6fc90a4154..95e4089479 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png differ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png index 5ad40cae4c..a880e87e0e 100644 Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/0_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_1.png deleted file mode 100644 index 70f7702f1e..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/0_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/0_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_2.png deleted file mode 100644 index eb948341bd..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/0_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/0_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_3.png deleted file mode 100644 index 6308ed96a8..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/0_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/0_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_4.png deleted file mode 100644 index 347c7a94ae..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/0_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/0_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/0_5.png deleted file mode 100644 index 628b156132..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/0_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/1.png b/Resources/Textures/Structures/Windows/cracks.rsi/1.png new file mode 100644 index 0000000000..067b895315 Binary files /dev/null and b/Resources/Textures/Structures/Windows/cracks.rsi/1.png differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/1_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_1.png deleted file mode 100644 index 2c6ab38760..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/1_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/1_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_2.png deleted file mode 100644 index 4d2acc510b..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/1_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/1_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_3.png deleted file mode 100644 index 9fc9978d84..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/1_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/1_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_4.png deleted file mode 100644 index 44a8a680d4..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/1_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/1_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/1_5.png deleted file mode 100644 index 8ce309da10..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/1_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/2.png b/Resources/Textures/Structures/Windows/cracks.rsi/2.png new file mode 100644 index 0000000000..0a88d182ec Binary files /dev/null and b/Resources/Textures/Structures/Windows/cracks.rsi/2.png differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/2_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_1.png deleted file mode 100644 index 70f7702f1e..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/2_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/2_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_2.png deleted file mode 100644 index eb948341bd..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/2_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/2_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_3.png deleted file mode 100644 index 6308ed96a8..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/2_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/2_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_4.png deleted file mode 100644 index 347c7a94ae..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/2_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/2_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/2_5.png deleted file mode 100644 index 628b156132..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/2_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/3.png b/Resources/Textures/Structures/Windows/cracks.rsi/3.png new file mode 100644 index 0000000000..201698af28 Binary files /dev/null and b/Resources/Textures/Structures/Windows/cracks.rsi/3.png differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/3_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_1.png deleted file mode 100644 index 2c6ab38760..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/3_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/3_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_2.png deleted file mode 100644 index 4d2acc510b..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/3_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/3_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_3.png deleted file mode 100644 index 9fc9978d84..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/3_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/3_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_4.png deleted file mode 100644 index 44a8a680d4..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/3_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/3_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/3_5.png deleted file mode 100644 index 8ce309da10..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/3_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/4_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_1.png deleted file mode 100644 index a678b5f0a9..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/4_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/4_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_2.png deleted file mode 100644 index dacceac27b..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/4_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/4_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_3.png deleted file mode 100644 index 38c3949aa0..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/4_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/4_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_4.png deleted file mode 100644 index 98cd4234eb..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/4_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/4_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/4_5.png deleted file mode 100644 index b1c9a90c1c..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/4_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/5_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_1.png deleted file mode 100644 index b89cfc2f20..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/5_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/5_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_2.png deleted file mode 100644 index 5faa4761b2..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/5_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/5_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_3.png deleted file mode 100644 index 6b74db91cd..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/5_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/5_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_4.png deleted file mode 100644 index 91f5cd962a..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/5_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/5_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/5_5.png deleted file mode 100644 index fd8e09e2a9..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/5_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/6_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_1.png deleted file mode 100644 index a678b5f0a9..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/6_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/6_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_2.png deleted file mode 100644 index dacceac27b..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/6_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/6_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_3.png deleted file mode 100644 index 38c3949aa0..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/6_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/6_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_4.png deleted file mode 100644 index 98cd4234eb..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/6_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/6_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/6_5.png deleted file mode 100644 index b1c9a90c1c..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/6_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/7_1.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_1.png deleted file mode 100644 index fdb4f85d92..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/7_1.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/7_2.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_2.png deleted file mode 100644 index ee9e116047..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/7_2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/7_3.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_3.png deleted file mode 100644 index 3ccbba05e3..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/7_3.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/7_4.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_4.png deleted file mode 100644 index d10caaacf4..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/7_4.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/7_5.png b/Resources/Textures/Structures/Windows/cracks.rsi/7_5.png deleted file mode 100644 index 23bbc0dce7..0000000000 Binary files a/Resources/Textures/Structures/Windows/cracks.rsi/7_5.png and /dev/null differ diff --git a/Resources/Textures/Structures/Windows/cracks.rsi/meta.json b/Resources/Textures/Structures/Windows/cracks.rsi/meta.json index 397ef62ebd..84375c566b 100644 --- a/Resources/Textures/Structures/Windows/cracks.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/cracks.rsi/meta.json @@ -5,727 +5,19 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "brndd", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit e06b82a7f4b2b09216fb28fd384c95a2e1dc50e5", "states": [ { - "name": "0_1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "name": "1", + "directions": 1, }, { - "name": "0_2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "name": "2", + "directions": 1, }, { - "name": "0_3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "name": "3", + "directions": 1, }, - { - "name": "0_4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "0_5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "1_1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "1_2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "1_3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "1_4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "1_5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "2_1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "2_2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "2_3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "2_4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "2_5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "3_1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "3_2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "3_3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "3_4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "3_5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "4_1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "4_2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "4_3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "4_4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "4_5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "5_1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "5_2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "5_3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "5_4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "5_5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "6_1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "6_2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "6_3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "6_4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "6_5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "7_1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "7_2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "7_3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "7_4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "7_5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } ] } diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png index 850c4af37a..b20d5ebd5e 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json index 128388e0be..4a03341090 100644 --- a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json @@ -1,163 +1,46 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [ { - "name": "full", - "delays": [ - [ - 1 - ] - ] + "name": "full" }, { "name": "pwindow0", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "pwindow1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "pwindow2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "pwindow3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "pwindow4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "pwindow5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "pwindow6", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "pwindow7", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png index 8b4eb741d6..fe379e2fef 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png index 270bb8a168..d75684f5d0 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png index 8b4eb741d6..fe379e2fef 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png index 270bb8a168..d75684f5d0 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png index 92a2e25099..051ddb5681 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png index c4dd3aeeb5..af6c01d906 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png index 92a2e25099..051ddb5681 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png index a0cee7e71e..dba4e93a8a 100644 Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png index b54c1e59b7..34c51d7c3d 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json index e6fb226588..456d8a2890 100644 --- a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json @@ -1,163 +1,46 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [ { - "name": "full", - "delays": [ - [ - 1 - ] - ] + "name": "full" }, { "name": "rwindow0", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rwindow1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rwindow2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rwindow3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rwindow4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rwindow5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rwindow6", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rwindow7", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png index e0c71ee394..8beafa06db 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png index 8789d79385..ba95fde9e5 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png index e0c71ee394..8beafa06db 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png index 8789d79385..ba95fde9e5 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png index 5545fa5d9e..754af67ca3 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png index 155e2d2a94..6f16899ede 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png index 5545fa5d9e..754af67ca3 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png differ diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png index ce4a98b3b5..f7fe3b6365 100644 Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png index 7a620720ce..5ed08bac42 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/full.png and b/Resources/Textures/Structures/Windows/window.rsi/full.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json index 1ad9449fc8..41b8be18b4 100644 --- a/Resources/Textures/Structures/Windows/window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/window.rsi/meta.json @@ -1,163 +1,46 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/icons/obj/structures/windows.dmi", "states": [ { - "name": "full", - "delays": [ - [ - 1 - ] - ] + "name": "full" }, { "name": "window0", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "window1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "window2", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "window3", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "window4", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "window5", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "window6", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "window7", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png index bc0a3c2731..37bade4a4a 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window0.png and b/Resources/Textures/Structures/Windows/window.rsi/window0.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png index 274b4bbb5e..4495aca459 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window1.png and b/Resources/Textures/Structures/Windows/window.rsi/window1.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png index bc0a3c2731..37bade4a4a 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window2.png and b/Resources/Textures/Structures/Windows/window.rsi/window2.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png index 274b4bbb5e..4495aca459 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window3.png and b/Resources/Textures/Structures/Windows/window.rsi/window3.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png index f7bdfb316f..13aaa2107e 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window4.png and b/Resources/Textures/Structures/Windows/window.rsi/window4.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png index cb440e5fc2..df8dd36cf5 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window5.png and b/Resources/Textures/Structures/Windows/window.rsi/window5.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png index f7bdfb316f..13aaa2107e 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window6.png and b/Resources/Textures/Structures/Windows/window.rsi/window6.png differ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png index 58a2d6a215..1a2e65fad7 100644 Binary files a/Resources/Textures/Structures/Windows/window.rsi/window7.png and b/Resources/Textures/Structures/Windows/window.rsi/window7.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png index bca01840b0..a2295320bb 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_0.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png index c474bd876c..680b2a96ab 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_1.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png index bca01840b0..a2295320bb 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_2.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png index c474bd876c..680b2a96ab 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_3.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png index a514dba669..fa87955656 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_4.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png index 19e829d543..eef2c0ec2a 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_5.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png index a514dba669..fa87955656 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_6.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png index 2b7d587adc..88ffa378d2 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_7.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png b/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png index bfaf9df9e8..9d3ff80e70 100644 Binary files a/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png and b/Resources/Textures/Structures/catwalk.rsi/catwalk_preview.png differ diff --git a/Resources/Textures/Structures/catwalk.rsi/meta.json b/Resources/Textures/Structures/catwalk.rsi/meta.json index c5e85cfe03..217278d1db 100644 --- a/Resources/Textures/Structures/catwalk.rsi/meta.json +++ b/Resources/Textures/Structures/catwalk.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png index 97b955cc6e..60d86646c2 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png and b/Resources/Textures/Structures/conveyor.rsi/conveyor_loose.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png index 7ad5f8fc70..9073e859cf 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png and b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png index 8bd276e82e..8cc2cae1f7 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png and b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_ccw_r.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png index 5625aa681d..cab28e89b0 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png and b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png index d2e18ca0ca..ce21cbb30f 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png and b/Resources/Textures/Structures/conveyor.rsi/conveyor_started_cw_r.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_ccw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_ccw.png index cbdeaf6f8d..05c488f1f4 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_ccw.png and b/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_ccw.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_cw.png b/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_cw.png index 116b3aed50..5f5050081f 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_cw.png and b/Resources/Textures/Structures/conveyor.rsi/conveyor_stopped_cw.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/greenlight.png b/Resources/Textures/Structures/conveyor.rsi/greenlight.png index afdc13ba05..c50fb82d07 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/greenlight.png and b/Resources/Textures/Structures/conveyor.rsi/greenlight.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/meta.json b/Resources/Textures/Structures/conveyor.rsi/meta.json index 5f14ace1b4..7dab3d111b 100644 --- a/Resources/Textures/Structures/conveyor.rsi/meta.json +++ b/Resources/Textures/Structures/conveyor.rsi/meta.json @@ -1 +1,256 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/blob/a846799c53f8ee9dcec4b075d7645f591f3ec19d/icons/obj/machines/conveyor.dmi", "states": [{"name": "conveyor_loose", "delays": [[1.0]]}, {"name": "conveyor_started_ccw", "directions": 8, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "conveyor_started_ccw_r", "directions": 8, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "conveyor_started_cw", "directions": 8, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "conveyor_started_cw_r", "directions": 8, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "conveyor_stopped_ccw", "directions": 8, "delays": [[1.0], [1.0], [1.0], [1.0], [1.0], [1.0], [1.0], [1.0]]}, {"name": "conveyor_stopped_cw", "directions": 8, "delays": [[1.0], [1.0], [1.0], [1.0], [1.0], [1.0], [1.0], [1.0]]}, {"name": "greenlight", "delays": [[1.0]]}, {"name": "redlight", "delays": [[1.0]]}, {"name": "switch", "delays": [[1.0]]}, {"name": "switch-fwd", "delays": [[1.0]]}, {"name": "switch-off", "delays": [[1.0]]}, {"name": "switch-rev", "delays": [[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "conveyor_loose" + }, + { + "name": "conveyor_started_ccw", + "directions": 8, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "conveyor_started_ccw_r", + "directions": 8, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "conveyor_started_cw", + "directions": 8, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "conveyor_started_cw_r", + "directions": 8, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "conveyor_stopped_ccw", + "directions": 8 + }, + { + "name": "conveyor_stopped_cw", + "directions": 8 + }, + { + "name": "greenlight" + }, + { + "name": "redlight" + }, + { + "name": "switch" + }, + { + "name": "switch-fwd" + }, + { + "name": "switch-off" + }, + { + "name": "switch-rev" + } + ] +} diff --git a/Resources/Textures/Structures/conveyor.rsi/redlight.png b/Resources/Textures/Structures/conveyor.rsi/redlight.png index 2c0a527254..812c1a6508 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/redlight.png and b/Resources/Textures/Structures/conveyor.rsi/redlight.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/switch-fwd.png b/Resources/Textures/Structures/conveyor.rsi/switch-fwd.png index 40853dd2ed..c13ef62ccc 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/switch-fwd.png and b/Resources/Textures/Structures/conveyor.rsi/switch-fwd.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/switch-off.png b/Resources/Textures/Structures/conveyor.rsi/switch-off.png index 75b9ff925b..a89901f190 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/switch-off.png and b/Resources/Textures/Structures/conveyor.rsi/switch-off.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/switch-rev.png b/Resources/Textures/Structures/conveyor.rsi/switch-rev.png index 9a9b94400f..f753046833 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/switch-rev.png and b/Resources/Textures/Structures/conveyor.rsi/switch-rev.png differ diff --git a/Resources/Textures/Structures/conveyor.rsi/switch.png b/Resources/Textures/Structures/conveyor.rsi/switch.png index c08c986edf..a89901f190 100644 Binary files a/Resources/Textures/Structures/conveyor.rsi/switch.png and b/Resources/Textures/Structures/conveyor.rsi/switch.png differ diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png new file mode 100644 index 0000000000..97b955cc6e Binary files /dev/null and b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_loose.png differ diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png new file mode 100644 index 0000000000..7ad5f8fc70 Binary files /dev/null and b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw.png differ diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png new file mode 100644 index 0000000000..8bd276e82e Binary files /dev/null and b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_ccw_r.png differ diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw.png new file mode 100644 index 0000000000..5625aa681d Binary files /dev/null and b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw.png differ diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png new file mode 100644 index 0000000000..d2e18ca0ca Binary files /dev/null and b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_started_cw_r.png differ diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_ccw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_ccw.png new file mode 100644 index 0000000000..cbdeaf6f8d Binary files /dev/null and b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_ccw.png differ diff --git a/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png new file mode 100644 index 0000000000..116b3aed50 Binary files /dev/null and b/Resources/Textures/Structures/conveyor_old.rsi/conveyor_stopped_cw.png differ diff --git a/Resources/Textures/Structures/conveyor_old.rsi/meta.json b/Resources/Textures/Structures/conveyor_old.rsi/meta.json new file mode 100644 index 0000000000..71aefcdba1 --- /dev/null +++ b/Resources/Textures/Structures/conveyor_old.rsi/meta.json @@ -0,0 +1,238 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/blob/a846799c53f8ee9dcec4b075d7645f591f3ec19d/icons/obj/machines/conveyor.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "conveyor_loose" + }, + { + "name": "conveyor_started_ccw", + "directions": 8, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "conveyor_started_ccw_r", + "directions": 8, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "conveyor_started_cw", + "directions": 8, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "conveyor_started_cw_r", + "directions": 8, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "conveyor_stopped_ccw", + "directions": 8 + }, + { + "name": "conveyor_stopped_cw", + "directions": 8 + } + ] +} diff --git a/Resources/Textures/Structures/dispensers.rsi/booze.png b/Resources/Textures/Structures/dispensers.rsi/booze.png new file mode 100644 index 0000000000..b33527ea79 Binary files /dev/null and b/Resources/Textures/Structures/dispensers.rsi/booze.png differ diff --git a/Resources/Textures/Structures/dispensers.rsi/booze_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/booze_dispenser.png deleted file mode 100644 index fdae72dead..0000000000 Binary files a/Resources/Textures/Structures/dispensers.rsi/booze_dispenser.png and /dev/null differ diff --git a/Resources/Textures/Structures/dispensers.rsi/dispenser.png b/Resources/Textures/Structures/dispensers.rsi/dispenser.png deleted file mode 100644 index 6f6e29b40f..0000000000 Binary files a/Resources/Textures/Structures/dispensers.rsi/dispenser.png and /dev/null differ diff --git a/Resources/Textures/Structures/dispensers.rsi/industrial-off.png b/Resources/Textures/Structures/dispensers.rsi/industrial-off.png new file mode 100644 index 0000000000..43186887ec Binary files /dev/null and b/Resources/Textures/Structures/dispensers.rsi/industrial-off.png differ diff --git a/Resources/Textures/Structures/dispensers.rsi/industrial-panel.png b/Resources/Textures/Structures/dispensers.rsi/industrial-panel.png new file mode 100644 index 0000000000..910013939b Binary files /dev/null and b/Resources/Textures/Structures/dispensers.rsi/industrial-panel.png differ diff --git a/Resources/Textures/Structures/dispensers.rsi/industrial-working.png b/Resources/Textures/Structures/dispensers.rsi/industrial-working.png new file mode 100644 index 0000000000..8c72948229 Binary files /dev/null and b/Resources/Textures/Structures/dispensers.rsi/industrial-working.png differ diff --git a/Resources/Textures/Structures/dispensers.rsi/industrial.png b/Resources/Textures/Structures/dispensers.rsi/industrial.png new file mode 100644 index 0000000000..a0be7e725a Binary files /dev/null and b/Resources/Textures/Structures/dispensers.rsi/industrial.png differ diff --git a/Resources/Textures/Structures/dispensers.rsi/industrial_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/industrial_dispenser.png deleted file mode 100644 index faf790d248..0000000000 Binary files a/Resources/Textures/Structures/dispensers.rsi/industrial_dispenser.png and /dev/null differ diff --git a/Resources/Textures/Structures/dispensers.rsi/meta.json b/Resources/Textures/Structures/dispensers.rsi/meta.json index bef6bf2fad..7a1f9fbc6d 100644 --- a/Resources/Textures/Structures/dispensers.rsi/meta.json +++ b/Resources/Textures/Structures/dispensers.rsi/meta.json @@ -1,23 +1,39 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "booze_dispenser" + "name": "booze", + "directions": 4 }, { - "name": "industrial_dispenser" + "name": "soda", + "directions": 4 }, { - "name": "soda_dispenser" + "name": "industrial" }, { - "name": "dispenser" + "name": "industrial-off" + }, + { + "name": "industrial-panel" + }, + { + "name": "industrial-working", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] } ] } diff --git a/Resources/Textures/Structures/dispensers.rsi/soda.png b/Resources/Textures/Structures/dispensers.rsi/soda.png new file mode 100644 index 0000000000..16b3ebcef6 Binary files /dev/null and b/Resources/Textures/Structures/dispensers.rsi/soda.png differ diff --git a/Resources/Textures/Structures/dispensers.rsi/soda_dispenser.png b/Resources/Textures/Structures/dispensers.rsi/soda_dispenser.png deleted file mode 100644 index ca7a568661..0000000000 Binary files a/Resources/Textures/Structures/dispensers.rsi/soda_dispenser.png and /dev/null differ diff --git a/Resources/Textures/Tiles/blue_circuit.png b/Resources/Textures/Tiles/blue_circuit.png new file mode 100644 index 0000000000..021c5363d6 Binary files /dev/null and b/Resources/Textures/Tiles/blue_circuit.png differ diff --git a/Resources/Textures/Tiles/dark.png b/Resources/Textures/Tiles/dark.png index 6599d6e771..1d44cc4119 100644 Binary files a/Resources/Textures/Tiles/dark.png and b/Resources/Textures/Tiles/dark.png differ diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png index 27628369aa..1628c20ae7 100644 Binary files a/Resources/Textures/Tiles/green_circuit.png and b/Resources/Textures/Tiles/green_circuit.png differ diff --git a/Resources/Textures/Tiles/silver.png b/Resources/Textures/Tiles/silver.png new file mode 100644 index 0000000000..630adae28a Binary files /dev/null and b/Resources/Textures/Tiles/silver.png differ diff --git a/Resources/Textures/Tiles/steel.png b/Resources/Textures/Tiles/steel.png index ebb183e5cb..33572086b4 100644 Binary files a/Resources/Textures/Tiles/steel.png and b/Resources/Textures/Tiles/steel.png differ diff --git a/Resources/Textures/Tiles/steel_warning1.png b/Resources/Textures/Tiles/steel_warning1.png deleted file mode 100644 index 4dd855f859..0000000000 Binary files a/Resources/Textures/Tiles/steel_warning1.png and /dev/null differ diff --git a/Resources/Textures/Tiles/steel_warning2.png b/Resources/Textures/Tiles/steel_warning2.png deleted file mode 100644 index 12600013ab..0000000000 Binary files a/Resources/Textures/Tiles/steel_warning2.png and /dev/null differ diff --git a/Resources/Textures/Tiles/underplating.png b/Resources/Textures/Tiles/underplating.png index 68de506c87..18dfaca091 100644 Binary files a/Resources/Textures/Tiles/underplating.png and b/Resources/Textures/Tiles/underplating.png differ diff --git a/Resources/Textures/Tiles/white.png b/Resources/Textures/Tiles/white.png index c5af14db58..8645f5e704 100644 Binary files a/Resources/Textures/Tiles/white.png and b/Resources/Textures/Tiles/white.png differ diff --git a/Resources/Textures/Tiles/white_warning1.png b/Resources/Textures/Tiles/white_warning1.png deleted file mode 100644 index b90c5fc7a3..0000000000 Binary files a/Resources/Textures/Tiles/white_warning1.png and /dev/null differ diff --git a/Resources/Textures/Tiles/white_warning2.png b/Resources/Textures/Tiles/white_warning2.png deleted file mode 100644 index 706f6c0135..0000000000 Binary files a/Resources/Textures/Tiles/white_warning2.png and /dev/null differ diff --git a/Resources/Textures/Tiles/wood.png b/Resources/Textures/Tiles/wood.png index bc87dd9b52..e6be307097 100644 Binary files a/Resources/Textures/Tiles/wood.png and b/Resources/Textures/Tiles/wood.png differ