diff --git a/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs b/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs index 00421218bf..1e9430a699 100644 --- a/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs +++ b/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs @@ -3,6 +3,7 @@ using System; using Content.Shared.GameObjects.Components.Chemistry; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Shared.Maths; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Client.GameObjects.Components.Chemistry @@ -12,9 +13,10 @@ namespace Content.Client.GameObjects.Components.Chemistry { [DataField("maxFillLevels")] private int _maxFillLevels = 0; [DataField("fillBaseName")] private string? _fillBaseName = null; - [DataField("emptySpriteName")] private string? _emptySpriteName = null; [DataField("layer")] private SolutionContainerLayers _layer = SolutionContainerLayers.Fill; [DataField("changeColor")] private bool _changeColor = true; + [DataField("emptySpriteName")] private string? _emptySpriteName = null; + [DataField("emptySpriteColor")] private Color _emptySpriteColor = Color.White; public override void OnChangeData(AppearanceComponent component) { @@ -46,7 +48,11 @@ namespace Content.Client.GameObjects.Components.Chemistry if (_emptySpriteName == null) sprite.LayerSetVisible(fillLayer, false); else + { sprite.LayerSetState(fillLayer, _emptySpriteName); + if (_changeColor) + sprite.LayerSetColor(fillLayer, _emptySpriteColor); + } } } } diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs index baffdd0c9c..4c7836179f 100644 --- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs +++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs @@ -53,7 +53,11 @@ namespace Content.Client.GameObjects.Components.Doors var sound = new AnimationTrackPlaySound(); CloseAnimation.AnimationTracks.Add(sound); - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_closeSound, 0)); + + if (_closeSound != null) + { + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_closeSound, 0)); + } } OpenAnimation = new Animation {Length = TimeSpan.FromSeconds(_delay)}; @@ -75,7 +79,11 @@ namespace Content.Client.GameObjects.Components.Doors var sound = new AnimationTrackPlaySound(); OpenAnimation.AnimationTracks.Add(sound); - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_openSound, 0)); + + if (_openSound != null) + { + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_openSound, 0)); + } } DenyAnimation = new Animation {Length = TimeSpan.FromSeconds(0.3f)}; @@ -87,7 +95,11 @@ namespace Content.Client.GameObjects.Components.Doors var sound = new AnimationTrackPlaySound(); DenyAnimation.AnimationTracks.Add(sound); - sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_denySound, 0, () => AudioHelpers.WithVariation(0.05f))); + + if (_denySound != null) + { + sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(_denySound, 0, () => AudioHelpers.WithVariation(0.05f))); + } } } diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs index 606e39fa86..f11819d931 100644 --- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs @@ -1,12 +1,14 @@ -using System; +using System; using System.Collections.Generic; using Content.Client.GameObjects.EntitySystems; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Utility; using static Robust.Client.GameObjects.SpriteComponent; namespace Content.Client.GameObjects.Components.IconSmoothing @@ -25,6 +27,8 @@ namespace Content.Client.GameObjects.Components.IconSmoothing [RegisterComponent] public class IconSmoothComponent : Component { + [Dependency] private readonly IMapManager _mapManager = default!; + [DataField("mode")] private IconSmoothingMode _mode = IconSmoothingMode.Corners; @@ -32,8 +36,6 @@ namespace Content.Client.GameObjects.Components.IconSmoothing internal ISpriteComponent? Sprite { get; private set; } - internal SnapGridComponent? SnapGrid { get; private set; } - private (GridId, Vector2i) _lastPosition; /// @@ -62,7 +64,6 @@ namespace Content.Client.GameObjects.Components.IconSmoothing { base.Initialize(); - SnapGrid = Owner.GetComponent(); Sprite = Owner.GetComponent(); } @@ -71,15 +72,14 @@ namespace Content.Client.GameObjects.Components.IconSmoothing { base.Startup(); - if (SnapGrid != null) + if (Owner.Transform.Anchored) { - SnapGrid.OnPositionChanged += SnapGridOnPositionChanged; - // ensures lastposition initial value is populated on spawn. Just calling // the hook here would cause a dirty event to fire needlessly - _lastPosition = (Owner.Transform.GridID, SnapGrid.Position); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + _lastPosition = (Owner.Transform.GridID, grid.TileIndicesFor(Owner.Transform.Coordinates)); - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner,null, SnapGrid.Offset, Mode)); + Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, null, Mode)); } if (Sprite != null && Mode == IconSmoothingMode.Corners) @@ -115,20 +115,22 @@ namespace Content.Client.GameObjects.Components.IconSmoothing private void CalculateNewSpriteCardinal() { - if (SnapGrid == null || Sprite == null) + if (!Owner.Transform.Anchored || Sprite == null) { return; } var dirs = CardinalConnectDirs.None; - if (MatchingEntity(SnapGrid.GetInDir(Direction.North))) + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var position = Owner.Transform.Coordinates; + if (MatchingEntity(grid.GetInDir(position, Direction.North))) dirs |= CardinalConnectDirs.North; - if (MatchingEntity(SnapGrid.GetInDir(Direction.South))) + if (MatchingEntity(grid.GetInDir(position, Direction.South))) dirs |= CardinalConnectDirs.South; - if (MatchingEntity(SnapGrid.GetInDir(Direction.East))) + if (MatchingEntity(grid.GetInDir(position, Direction.East))) dirs |= CardinalConnectDirs.East; - if (MatchingEntity(SnapGrid.GetInDir(Direction.West))) + if (MatchingEntity(grid.GetInDir(position, Direction.West))) dirs |= CardinalConnectDirs.West; Sprite.LayerSetState(0, $"{StateBase}{(int) dirs}"); @@ -151,19 +153,21 @@ namespace Content.Client.GameObjects.Components.IconSmoothing protected (CornerFill ne, CornerFill nw, CornerFill sw, CornerFill se) CalculateCornerFill() { - if (SnapGrid == null) + if (!Owner.Transform.Anchored) { return (CornerFill.None, CornerFill.None, CornerFill.None, CornerFill.None); } - var n = MatchingEntity(SnapGrid.GetInDir(Direction.North)); - var ne = MatchingEntity(SnapGrid.GetInDir(Direction.NorthEast)); - var e = MatchingEntity(SnapGrid.GetInDir(Direction.East)); - var se = MatchingEntity(SnapGrid.GetInDir(Direction.SouthEast)); - var s = MatchingEntity(SnapGrid.GetInDir(Direction.South)); - var sw = MatchingEntity(SnapGrid.GetInDir(Direction.SouthWest)); - var w = MatchingEntity(SnapGrid.GetInDir(Direction.West)); - var nw = MatchingEntity(SnapGrid.GetInDir(Direction.NorthWest)); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var position = Owner.Transform.Coordinates; + var n = MatchingEntity(grid.GetInDir(position, Direction.North)); + var ne = MatchingEntity(grid.GetInDir(position, Direction.NorthEast)); + var e = MatchingEntity(grid.GetInDir(position, Direction.East)); + var se = MatchingEntity(grid.GetInDir(position, Direction.SouthEast)); + var s = MatchingEntity(grid.GetInDir(position, Direction.South)); + var sw = MatchingEntity(grid.GetInDir(position, Direction.SouthWest)); + var w = MatchingEntity(grid.GetInDir(position, Direction.West)); + var nw = MatchingEntity(grid.GetInDir(position, Direction.NorthWest)); // ReSharper disable InconsistentNaming var cornerNE = CornerFill.None; @@ -234,28 +238,28 @@ namespace Content.Client.GameObjects.Components.IconSmoothing { base.Shutdown(); - if (SnapGrid != null) + if (Owner.Transform.Anchored) { - SnapGrid.OnPositionChanged -= SnapGridOnPositionChanged; - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, _lastPosition, SnapGrid.Offset, Mode)); + Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, _lastPosition, Mode)); } } - private void SnapGridOnPositionChanged() + public void SnapGridOnPositionChanged() { - if (SnapGrid != null) + if (Owner.Transform.Anchored) { - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, _lastPosition, SnapGrid.Offset, Mode)); - _lastPosition = (Owner.Transform.GridID, SnapGrid.Position); + Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, _lastPosition, Mode)); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + _lastPosition = (Owner.Transform.GridID, grid.TileIndicesFor(Owner.Transform.Coordinates)); } } [System.Diagnostics.Contracts.Pure] - protected bool MatchingEntity(IEnumerable candidates) + protected bool MatchingEntity(IEnumerable candidates) { foreach (var entity in candidates) { - if (!entity.TryGetComponent(out IconSmoothComponent? other)) + if (!Owner.EntityManager.ComponentManager.TryGetComponent(entity, out IconSmoothComponent? other)) { continue; } diff --git a/Content.Client/GameObjects/Components/LowWallComponent.cs b/Content.Client/GameObjects/Components/LowWallComponent.cs index 7c40805c7f..a6d3c89712 100644 --- a/Content.Client/GameObjects/Components/LowWallComponent.cs +++ b/Content.Client/GameObjects/Components/LowWallComponent.cs @@ -1,10 +1,13 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using Content.Client.GameObjects.Components.IconSmoothing; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using static Robust.Client.GameObjects.SpriteComponent; @@ -23,6 +26,8 @@ namespace Content.Client.GameObjects.Components { public override string Name => "LowWall"; + [Dependency] private readonly IMapManager _mapManager = default!; + public CornerFill LastCornerNE { get; private set; } public CornerFill LastCornerSE { get; private set; } public CornerFill LastCornerSW { get; private set; } @@ -65,19 +70,22 @@ namespace Content.Client.GameObjects.Components { base.CalculateNewSprite(); - if (Sprite == null || SnapGrid == null || _overlaySprite == null) + if (Sprite == null || !Owner.Transform.Anchored || _overlaySprite == null) { return; } - var (n, nl) = MatchingWall(SnapGrid.GetInDir(Direction.North)); - var (ne, nel) = MatchingWall(SnapGrid.GetInDir(Direction.NorthEast)); - var (e, el) = MatchingWall(SnapGrid.GetInDir(Direction.East)); - var (se, sel) = MatchingWall(SnapGrid.GetInDir(Direction.SouthEast)); - var (s, sl) = MatchingWall(SnapGrid.GetInDir(Direction.South)); - var (sw, swl) = MatchingWall(SnapGrid.GetInDir(Direction.SouthWest)); - var (w, wl) = MatchingWall(SnapGrid.GetInDir(Direction.West)); - var (nw, nwl) = MatchingWall(SnapGrid.GetInDir(Direction.NorthWest)); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + + var (n, nl) = MatchingWall(grid.GetInDir(coords, Direction.North)); + var (ne, nel) = MatchingWall(grid.GetInDir(coords, Direction.NorthEast)); + var (e, el) = MatchingWall(grid.GetInDir(coords, Direction.East)); + var (se, sel) = MatchingWall(grid.GetInDir(coords, Direction.SouthEast)); + var (s, sl) = MatchingWall(grid.GetInDir(coords, Direction.South)); + var (sw, swl) = MatchingWall(grid.GetInDir(coords, Direction.SouthWest)); + var (w, wl) = MatchingWall(grid.GetInDir(coords, Direction.West)); + var (nw, nwl) = MatchingWall(grid.GetInDir(coords, Direction.NorthWest)); // ReSharper disable InconsistentNaming var cornerNE = CornerFill.None; @@ -194,9 +202,9 @@ namespace Content.Client.GameObjects.Components LastCornerSW = cornerSW; LastCornerNW = cornerNW; - foreach (var entity in SnapGrid.GetLocal()) + foreach (var entity in grid.GetLocal(coords)) { - if (entity.TryGetComponent(out WindowComponent? window)) + if (Owner.EntityManager.ComponentManager.TryGetComponent(entity, out WindowComponent? window)) { window.UpdateSprite(); } @@ -204,11 +212,11 @@ namespace Content.Client.GameObjects.Components } [Pure] - private (bool connected, bool lowWall) MatchingWall(IEnumerable candidates) + private (bool connected, bool lowWall) MatchingWall(IEnumerable candidates) { foreach (var entity in candidates) { - if (!entity.TryGetComponent(out IconSmoothComponent? other)) + if (!Owner.EntityManager.ComponentManager.TryGetComponent(entity, out IconSmoothComponent? other)) { continue; } diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs b/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs deleted file mode 100644 index c5d493c02c..0000000000 --- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodVisualizer.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Content.Shared.GameObjects.Components.Nutrition; -using Content.Shared.Utility; -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Shared.Serialization.Manager.Attributes; -using Robust.Shared.Utility; -using YamlDotNet.RepresentationModel; - -namespace Content.Client.GameObjects.Components.Nutrition -{ - [UsedImplicitly] - public sealed class DrinkFoodVisualizer : AppearanceVisualizer - { - [DataField("steps")] - private int _steps; - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - var sprite = component.Owner.GetComponent(); - - if (!component.TryGetData(SharedFoodComponent.FoodVisuals.MaxUses, out var maxUses)) - { - return; - } - - if (component.TryGetData(SharedFoodComponent.FoodVisuals.Visual, out var usesLeft)) - { - var step = ContentHelpers.RoundToLevels(usesLeft, maxUses, _steps); - sprite.LayerSetState(0, $"icon-{step}"); - } - else - { - sprite.LayerSetState(0, "icon-0"); - } - } - } -} diff --git a/Content.Client/GameObjects/Components/WindowComponent.cs b/Content.Client/GameObjects/Components/WindowComponent.cs index e7261333a4..13b980b8d8 100644 --- a/Content.Client/GameObjects/Components/WindowComponent.cs +++ b/Content.Client/GameObjects/Components/WindowComponent.cs @@ -1,8 +1,11 @@ -using System.Diagnostics.CodeAnalysis; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using Content.Client.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components; 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.GameObjects.Components.IconSmoothing.IconSmoothComponent; @@ -12,18 +15,18 @@ namespace Content.Client.GameObjects.Components [ComponentReference(typeof(SharedWindowComponent))] public sealed class WindowComponent : SharedWindowComponent { + [Dependency] private readonly IMapManager _mapManager = default!; + [DataField("base")] private string? _stateBase; private ISpriteComponent? _sprite; - private SnapGridComponent? _snapGrid; public override void Initialize() { base.Initialize(); _sprite = Owner.GetComponent(); - _snapGrid = Owner.GetComponent(); } /// @@ -31,11 +34,6 @@ namespace Content.Client.GameObjects.Components { base.Startup(); - if (_snapGrid != null) - { - _snapGrid.OnPositionChanged += SnapGridOnPositionChanged; - } - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new WindowSmoothDirtyEvent(Owner)); if (_sprite != null) @@ -67,18 +65,7 @@ namespace Content.Client.GameObjects.Components } } - /// - protected override void Shutdown() - { - if (_snapGrid != null) - { - _snapGrid.OnPositionChanged -= SnapGridOnPositionChanged; - } - - base.Shutdown(); - } - - private void SnapGridOnPositionChanged() + public void SnapGridOnPositionChanged() { Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new WindowSmoothDirtyEvent(Owner)); } @@ -102,14 +89,14 @@ namespace Content.Client.GameObjects.Components private LowWallComponent? FindLowWall() { - if (_snapGrid == null) - { + if (!Owner.Transform.Anchored) return null; - } - foreach (var entity in _snapGrid.GetLocal()) + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + foreach (var entity in grid.GetLocal(coords)) { - if (entity.TryGetComponent(out LowWallComponent? lowWall)) + if (Owner.EntityManager.ComponentManager.TryGetComponent(entity, out LowWallComponent? lowWall)) { return lowWall; } diff --git a/Content.Client/GameObjects/Components/WindowVisualizer.cs b/Content.Client/GameObjects/Components/WindowVisualizer.cs index bc790ba1f5..7763d70bd0 100644 --- a/Content.Client/GameObjects/Components/WindowVisualizer.cs +++ b/Content.Client/GameObjects/Components/WindowVisualizer.cs @@ -1,9 +1,11 @@ -using System; +using System; using Content.Shared.GameObjects.Components; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; namespace Content.Client.GameObjects.Components { @@ -15,10 +17,10 @@ namespace Content.Client.GameObjects.Components base.OnChangeData(component); var sprite = component.Owner.GetComponent(); - if (!component.Owner.TryGetComponent(out SnapGridComponent? snapGrid)) + if (!component.Owner.Transform.Anchored) return; - var lowWall = FindLowWall(snapGrid); + var lowWall = FindLowWall(IoCManager.Resolve(), component.Owner.Transform); if (lowWall == null) return; @@ -48,11 +50,13 @@ namespace Content.Client.GameObjects.Components } } - private static LowWallComponent? FindLowWall(SnapGridComponent snapGrid) + private static LowWallComponent? FindLowWall(IMapManager mapManager, ITransformComponent transform) { - foreach (var entity in snapGrid.GetLocal()) + var grid = mapManager.GetGrid(transform.GridID); + var coords = transform.Coordinates; + foreach (var entity in grid.GetLocal(coords)) { - if (entity.TryGetComponent(out LowWallComponent? lowWall)) + if (transform.Owner.EntityManager.ComponentManager.TryGetComponent(entity, out LowWallComponent? lowWall)) { return lowWall; } diff --git a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs b/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs index 5a5c058d2c..7a435e9dbf 100644 --- a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Content.Client.GameObjects.Components.IconSmoothing; using JetBrains.Annotations; @@ -6,6 +6,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; +using Robust.Shared.Utility; namespace Content.Client.GameObjects.EntitySystems { @@ -17,7 +18,7 @@ namespace Content.Client.GameObjects.EntitySystems { [Dependency] private readonly IMapManager _mapManager = default!; - private readonly Queue _dirtyEntities = new(); + private readonly Queue _dirtyEntities = new(); private int _generation; @@ -27,13 +28,18 @@ namespace Content.Client.GameObjects.EntitySystems base.Initialize(); SubscribeLocalEvent(HandleDirtyEvent); + + SubscribeLocalEvent(HandleSnapGridMove); } + public override void Shutdown() { base.Shutdown(); UnsubscribeLocalEvent(); + + UnsubscribeLocalEvent(HandleSnapGridMove); } public override void FrameUpdate(float frameTime) @@ -63,20 +69,20 @@ namespace Content.Client.GameObjects.EntitySystems senderEnt.TryGetComponent(out IconSmoothComponent? iconSmooth) && iconSmooth.Running) { - var snapGrid = senderEnt.GetComponent(); + var grid1 = _mapManager.GetGrid(senderEnt.Transform.GridID); + var coords = senderEnt.Transform.Coordinates; - _dirtyEntities.Enqueue(senderEnt); - AddValidEntities(snapGrid.GetInDir(Direction.North)); - AddValidEntities(snapGrid.GetInDir(Direction.South)); - AddValidEntities(snapGrid.GetInDir(Direction.East)); - AddValidEntities(snapGrid.GetInDir(Direction.West)); + _dirtyEntities.Enqueue(senderEnt.Uid); + AddValidEntities(grid1.GetInDir(coords, Direction.North)); + AddValidEntities(grid1.GetInDir(coords, Direction.South)); + AddValidEntities(grid1.GetInDir(coords, Direction.East)); + AddValidEntities(grid1.GetInDir(coords, Direction.West)); if (ev.Mode == IconSmoothingMode.Corners) { - - AddValidEntities(snapGrid.GetInDir(Direction.NorthEast)); - AddValidEntities(snapGrid.GetInDir(Direction.SouthEast)); - AddValidEntities(snapGrid.GetInDir(Direction.SouthWest)); - AddValidEntities(snapGrid.GetInDir(Direction.NorthWest)); + AddValidEntities(grid1.GetInDir(coords, Direction.NorthEast)); + AddValidEntities(grid1.GetInDir(coords, Direction.SouthEast)); + AddValidEntities(grid1.GetInDir(coords, Direction.SouthWest)); + AddValidEntities(grid1.GetInDir(coords, Direction.NorthWest)); } } @@ -85,43 +91,43 @@ namespace Content.Client.GameObjects.EntitySystems { var pos = ev.LastPosition.Value.pos; - AddValidEntities(grid.GetSnapGridCell(pos + new Vector2i(1, 0), ev.Offset)); - AddValidEntities(grid.GetSnapGridCell(pos + new Vector2i(-1, 0), ev.Offset)); - AddValidEntities(grid.GetSnapGridCell(pos + new Vector2i(0, 1), ev.Offset)); - AddValidEntities(grid.GetSnapGridCell(pos + new Vector2i(0, -1), ev.Offset)); + AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(1, 0))); + AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(-1, 0))); + AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(0, 1))); + AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(0, -1))); if (ev.Mode == IconSmoothingMode.Corners) { - AddValidEntities(grid.GetSnapGridCell(pos + new Vector2i(1, 1), ev.Offset)); - AddValidEntities(grid.GetSnapGridCell(pos + new Vector2i(-1, -1), ev.Offset)); - AddValidEntities(grid.GetSnapGridCell(pos + new Vector2i(-1, 1), ev.Offset)); - AddValidEntities(grid.GetSnapGridCell(pos + new Vector2i(1, -1), ev.Offset)); + AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(1, 1))); + AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(-1, -1))); + AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(-1, 1))); + AddValidEntities(grid.GetAnchoredEntities(pos + new Vector2i(1, -1))); } } } - private void AddValidEntities(IEnumerable candidates) + private static void HandleSnapGridMove(EntityUid uid, IconSmoothComponent component, SnapGridPositionChangedEvent args) + { + component.SnapGridOnPositionChanged(); + } + + private void AddValidEntities(IEnumerable candidates) { foreach (var entity in candidates) { - if (entity.HasComponent()) + if (ComponentManager.HasComponent(entity)) { _dirtyEntities.Enqueue(entity); } } } - private void AddValidEntities(IEnumerable candidates) - { - AddValidEntities(candidates.Select(c => c.Owner)); - } - - private void CalculateNewSprite(IEntity entity) + private void CalculateNewSprite(EntityUid euid) { // The generation check prevents updating an entity multiple times per tick. // As it stands now, it's totally possible for something to get queued twice. // Generation on the component is set after an update so we can cull updates that happened this generation. - if (!entity.IsValid() - || !entity.TryGetComponent(out IconSmoothComponent? smoothing) + if (!EntityManager.EntityExists(euid) + || !ComponentManager.TryGetComponent(euid, out IconSmoothComponent? smoothing) || smoothing.UpdateGeneration == _generation) { return; @@ -138,16 +144,14 @@ namespace Content.Client.GameObjects.EntitySystems /// public sealed class IconSmoothDirtyEvent : EntityEventArgs { - public IconSmoothDirtyEvent(IEntity sender, (GridId grid, Vector2i pos)? lastPosition, SnapGridOffset offset, IconSmoothingMode mode) + public IconSmoothDirtyEvent(IEntity sender, (GridId grid, Vector2i pos)? lastPosition, IconSmoothingMode mode) { LastPosition = lastPosition; - Offset = offset; Mode = mode; Sender = sender; } public (GridId grid, Vector2i pos)? LastPosition { get; } - public SnapGridOffset Offset { get; } public IconSmoothingMode Mode { get; } public IEntity Sender { get; } } diff --git a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs index 77f0133cdd..96ef802c9c 100644 --- a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Client.GameObjects.Components; using JetBrains.Annotations; using Robust.Shared.GameObjects; @@ -15,6 +15,7 @@ namespace Content.Client.GameObjects.EntitySystems base.Initialize(); SubscribeLocalEvent(HandleDirtyEvent); + SubscribeLocalEvent(HandleSnapGridMove); } public override void Shutdown() @@ -22,6 +23,7 @@ namespace Content.Client.GameObjects.EntitySystems base.Shutdown(); UnsubscribeLocalEvent(); + UnsubscribeLocalEvent(HandleSnapGridMove); } private void HandleDirtyEvent(WindowSmoothDirtyEvent ev) @@ -32,6 +34,11 @@ namespace Content.Client.GameObjects.EntitySystems } } + private static void HandleSnapGridMove(EntityUid uid, WindowComponent component, SnapGridPositionChangedEvent args) + { + component.SnapGridOnPositionChanged(); + } + public override void FrameUpdate(float frameTime) { base.FrameUpdate(frameTime); diff --git a/Content.Client/State/GameScreen.cs b/Content.Client/State/GameScreen.cs index 3342ec211f..a601f2210d 100644 --- a/Content.Client/State/GameScreen.cs +++ b/Content.Client/State/GameScreen.cs @@ -165,5 +165,13 @@ namespace Content.Client.State Viewport.Viewport.Eye = _eyeManager.CurrentEye; } + + protected override void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args) + { + if (args.Viewport == null) + base.OnKeyBindStateChanged(new ViewportBoundKeyEventArgs(args.KeyEventArgs, Viewport.Viewport)); + else + base.OnKeyBindStateChanged(args); + } } } diff --git a/Content.Client/State/GameScreenBase.cs b/Content.Client/State/GameScreenBase.cs index f9b6883c55..230e49c9d4 100644 --- a/Content.Client/State/GameScreenBase.cs +++ b/Content.Client/State/GameScreenBase.cs @@ -214,10 +214,10 @@ namespace Content.Client.State /// Converts a state change event from outside the simulation to inside the simulation. /// /// Event data values for a bound key state change. - private void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args) + protected virtual void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args) { // If there is no InputSystem, then there is nothing to forward to, and nothing to do here. - if(!EntitySystemManager.TryGetEntitySystem(out InputSystem inputSys)) + if(!EntitySystemManager.TryGetEntitySystem(out InputSystem? inputSys)) return; var kArgs = args.KeyEventArgs; diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs index 17b1bf5da4..037235198d 100644 --- a/Content.IntegrationTests/ContentIntegrationTest.cs +++ b/Content.IntegrationTests/ContentIntegrationTest.cs @@ -28,6 +28,8 @@ namespace Content.IntegrationTests FailureLogLevel = LogLevel.Warning }; + options.ContentStart = true; + options.ContentAssemblies = new[] { typeof(Shared.EntryPoint).Assembly, @@ -69,6 +71,8 @@ namespace Content.IntegrationTests FailureLogLevel = LogLevel.Warning }; + options.ContentStart = true; + options.ContentAssemblies = new[] { typeof(Shared.EntryPoint).Assembly, diff --git a/Content.Server/Commands/GameTicking/TileWallsCommand.cs b/Content.Server/Commands/GameTicking/TileWallsCommand.cs index 69c18f1982..1e1a64f6ed 100644 --- a/Content.Server/Commands/GameTicking/TileWallsCommand.cs +++ b/Content.Server/Commands/GameTicking/TileWallsCommand.cs @@ -90,7 +90,7 @@ namespace Content.Server.Commands.GameTicking continue; } - if (!childEntity.TryGetComponent(out SnapGridComponent? snapGrid)) + if (!childEntity.Transform.Anchored) { continue; } diff --git a/Content.Server/Construction/Completions/SnapToGrid.cs b/Content.Server/Construction/Completions/SnapToGrid.cs index 33b015aacf..dba3151742 100644 --- a/Content.Server/Construction/Completions/SnapToGrid.cs +++ b/Content.Server/Construction/Completions/SnapToGrid.cs @@ -4,10 +4,8 @@ using Content.Server.Utility; using Content.Shared.Construction; using JetBrains.Annotations; using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; using Robust.Shared.Maths; using Robust.Shared.Serialization.Manager.Attributes; -using YamlDotNet.Serialization; namespace Content.Server.Construction.Completions { @@ -15,14 +13,13 @@ namespace Content.Server.Construction.Completions [DataDefinition] public class SnapToGrid : IGraphAction { - [DataField("offset")] public SnapGridOffset Offset { get; private set; } = SnapGridOffset.Center; [DataField("southRotation")] public bool SouthRotation { get; private set; } = false; public async Task PerformAction(IEntity entity, IEntity? user) { if (entity.Deleted) return; - entity.SnapToGrid(Offset); + entity.SnapToGrid(); if (SouthRotation) { entity.Transform.LocalRotation = Angle.Zero; diff --git a/Content.Server/GameObjects/Components/AnchorableComponent.cs b/Content.Server/GameObjects/Components/AnchorableComponent.cs index e529354283..185dfe52d3 100644 --- a/Content.Server/GameObjects/Components/AnchorableComponent.cs +++ b/Content.Server/GameObjects/Components/AnchorableComponent.cs @@ -10,7 +10,6 @@ using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Physics; -using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components @@ -105,7 +104,7 @@ namespace Content.Server.GameObjects.Components } if (Snap) - Owner.SnapToGrid(SnapGridOffset.Center, Owner.EntityManager); + Owner.SnapToGrid(Owner.EntityManager); Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new AnchoredMessage(), false); diff --git a/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs b/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs index 0d3a351348..cfaf5a0d21 100644 --- a/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs @@ -3,6 +3,8 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.Atmos; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization.Manager.Attributes; @@ -14,6 +16,8 @@ namespace Content.Server.GameObjects.Components.Atmos [RegisterComponent] public class AirtightComponent : Component, IMapInit { + [Dependency] private readonly IMapManager _mapManager = default!; + private (GridId, Vector2i) _lastPosition; private AtmosphereSystem _atmosphereSystem = default!; @@ -77,14 +81,13 @@ namespace Content.Server.GameObjects.Components.Atmos _atmosphereSystem = EntitySystem.Get(); - // Using the SnapGrid is critical for performance, and thus if it is absent the component - // will not be airtight. A warning is much easier to track down than the object magically - // not being airtight, so log one if the SnapGrid component is missing. - Owner.EnsureComponentWarn(out SnapGridComponent _); - if (_fixAirBlockedDirectionInitialize) RotateEvent(new RotateEvent(Owner, Angle.Zero, Owner.Transform.WorldRotation)); + // Adding this component will immediately anchor the entity, because the atmos system + // requires airtight entities to be anchored for performance. + Owner.Transform.Anchored = true; + UpdatePosition(); } @@ -116,28 +119,25 @@ namespace Content.Server.GameObjects.Components.Atmos return newAirBlockedDirs; } + /// public void MapInit() { - if (Owner.TryGetComponent(out SnapGridComponent? snapGrid)) + if (Owner.Transform.Anchored) { - snapGrid.OnPositionChanged += OnTransformMove; - _lastPosition = (Owner.Transform.GridID, snapGrid.Position); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + _lastPosition = (Owner.Transform.GridID, grid.TileIndicesFor(Owner.Transform.Coordinates)); } UpdatePosition(); } + /// protected override void Shutdown() { base.Shutdown(); _airBlocked = false; - if (Owner.TryGetComponent(out SnapGridComponent? snapGrid)) - { - snapGrid.OnPositionChanged -= OnTransformMove; - } - UpdatePosition(_lastPosition.Item1, _lastPosition.Item2); if (_fixVacuum) @@ -146,21 +146,25 @@ namespace Content.Server.GameObjects.Components.Atmos } } - private void OnTransformMove() + public void OnTransformMove() { UpdatePosition(_lastPosition.Item1, _lastPosition.Item2); UpdatePosition(); - if (Owner.TryGetComponent(out SnapGridComponent? snapGrid)) + if (Owner.Transform.Anchored) { - _lastPosition = (Owner.Transform.GridID, snapGrid.Position); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + _lastPosition = (Owner.Transform.GridID, grid.TileIndicesFor(Owner.Transform.Coordinates)); } } private void UpdatePosition() { - if (Owner.TryGetComponent(out SnapGridComponent? snapGrid)) - UpdatePosition(Owner.Transform.GridID, snapGrid.Position); + if (Owner.Transform.Anchored) + { + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + UpdatePosition(Owner.Transform.GridID, grid.TileIndicesFor(Owner.Transform.Coordinates)); + } } private void UpdatePosition(GridId gridId, Vector2i pos) diff --git a/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs index 4cf8b27980..8019c0b313 100644 --- a/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs @@ -1,5 +1,6 @@ #nullable enable using System; +using System.Collections.Generic; using System.Linq; using Content.Server.Atmos; using Content.Server.GameObjects.Components.Atmos.Piping; @@ -11,6 +12,8 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; using Robust.Shared.Physics; @@ -24,6 +27,8 @@ namespace Content.Server.GameObjects.Components.Atmos [ComponentReference(typeof(IActivate))] public class GasCanisterComponent : Component, IGasMixtureHolder, IActivate { + [Dependency] private readonly IMapManager _mapManager = default!; + public override string Name => "GasCanister"; private const int MaxLabelLength = 32; @@ -114,9 +119,11 @@ namespace Content.Server.GameObjects.Components.Atmos public void TryConnectToPort() { - if (!Owner.TryGetComponent(out var snapGrid)) return; - var port = snapGrid.GetLocal() - .Select(entity => entity.TryGetComponent(out var port) ? port : null) + if (!Owner.Transform.Anchored) return; + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + var port = grid.GetLocal(coords) + .Select(entity => Owner.EntityManager.ComponentManager.TryGetComponent(entity, out var port) ? port : null) .Where(port => port != null) .Where(port => !port!.ConnectedToCanister) .FirstOrDefault(); diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs index 315bebea6a..c97745d136 100644 --- a/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs +++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs @@ -1,9 +1,12 @@ #nullable enable +using System.Collections.Generic; using System.Linq; using Content.Server.GameObjects.Components.NodeContainer; using Content.Server.GameObjects.Components.NodeContainer.Nodes; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Atmos.Piping @@ -13,6 +16,8 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping { public override string Name => "GasCanisterPort"; + [Dependency] private readonly IMapManager _mapManager = default!; + [ViewVariables] public GasCanisterComponent? ConnectedCanister { get; private set; } @@ -27,12 +32,14 @@ namespace Content.Server.GameObjects.Components.Atmos.Piping base.Initialize(); Owner.EnsureComponentWarn(); SetGasPort(); - if (Owner.TryGetComponent(out var snapGrid)) + if (Owner.Transform.Anchored) { - var entities = snapGrid.GetLocal(); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + var entities = grid.GetLocal(coords); foreach (var entity in entities) { - if (entity.TryGetComponent(out var canister) && canister.Anchored && !canister.ConnectedToPort) + if (Owner.EntityManager.ComponentManager.TryGetComponent(entity, out var canister) && canister.Anchored && !canister.ConnectedToPort) { canister.TryConnectToPort(); break; diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs index 0a1dfb4057..206193bbe2 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs @@ -1,11 +1,10 @@ -#nullable enable +#nullable enable using System; using System.Linq; using Content.Server.GameObjects.Components.Atmos; using Content.Server.Utility; using Content.Shared.Chemistry; using Content.Shared.GameObjects.EntitySystems; -using Content.Shared.Interfaces.GameObjects.Components; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; @@ -24,7 +23,6 @@ namespace Content.Server.GameObjects.Components.Chemistry [Dependency] protected readonly IMapManager MapManager = default!; [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [ComponentDependency] protected readonly SnapGridComponent? SnapGridComponent = default!; [ComponentDependency] protected readonly SolutionContainerComponent? SolutionContainerComponent = default!; public int Amount { get; set; } public SolutionAreaEffectInceptionComponent? Inception { get; set; } @@ -63,26 +61,20 @@ namespace Content.Server.GameObjects.Components.Chemistry return; } - if (SnapGridComponent == null) - { - Logger.Error("AreaEffectComponent attached to " + Owner.Prototype.ID + - " couldn't get SnapGridComponent from owner."); - return; - } - void SpreadToDir(Direction dir) { - foreach (var neighbor in SnapGridComponent.GetInDir(dir)) + var grid = MapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + foreach (var neighbor in grid.GetInDir(coords, dir)) { - if (neighbor.TryGetComponent(out SolutionAreaEffectComponent? comp) && comp.Inception == Inception) + if (Owner.EntityManager.ComponentManager.TryGetComponent(neighbor, out SolutionAreaEffectComponent? comp) && comp.Inception == Inception) return; - if (neighbor.TryGetComponent(out AirtightComponent? airtight) && airtight.AirBlocked) + if (Owner.EntityManager.ComponentManager.TryGetComponent(neighbor, out AirtightComponent? airtight) && airtight.AirBlocked) return; } - var newEffect = - Owner.EntityManager.SpawnEntity(Owner.Prototype.ID, SnapGridComponent.DirectionToGrid(dir)); + var newEffect = Owner.EntityManager.SpawnEntity(Owner.Prototype.ID, grid.DirectionToGrid(coords, dir)); if (!newEffect.TryGetComponent(out SolutionAreaEffectComponent? effectComponent)) { diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs index a240ee60db..0b31b4f8bd 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs @@ -26,6 +26,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Physics; using Robust.Shared.Player; @@ -43,6 +44,7 @@ namespace Content.Server.GameObjects.Components.Disposal public class DisposalMailingUnitComponent : SharedDisposalMailingUnitComponent, IInteractHand, IActivate, IInteractUsing, IDragDropOn { [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly IMapManager _mapManager = default!; private const string HolderPrototypeId = "DisposalHolder"; @@ -277,17 +279,17 @@ namespace Content.Server.GameObjects.Components.Disposal return false; } - var snapGrid = Owner.GetComponent(); - var entry = snapGrid - .GetLocal() - .FirstOrDefault(entity => entity.HasComponent()); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + var entry = grid.GetLocal(coords) + .FirstOrDefault(entity => Owner.EntityManager.ComponentManager.HasComponent(entity)); - if (entry == null) + if (entry == default) { return false; } - var entryComponent = entry.GetComponent(); + var entryComponent = Owner.EntityManager.ComponentManager.GetComponent(entry); var entities = _container.ContainedEntities.ToList(); foreach (var entity in _container.ContainedEntities.ToList()) { diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs index f0102384cd..22806c2daf 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs @@ -1,5 +1,6 @@ #nullable enable using System; +using System.Collections.Generic; using System.Linq; using Content.Shared.GameObjects.Components.Disposal; using Content.Shared.GameObjects.EntitySystems; @@ -12,6 +13,7 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Player; using Robust.Shared.Prototypes; @@ -26,6 +28,7 @@ namespace Content.Server.GameObjects.Components.Disposal public abstract class DisposalTubeComponent : Component, IDisposalTubeComponent, IBreakAct { [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly IMapManager _mapManager = default!; private static readonly TimeSpan ClangDelay = TimeSpan.FromSeconds(0.5); private TimeSpan _lastClang; @@ -67,12 +70,13 @@ namespace Content.Server.GameObjects.Components.Disposal public IDisposalTubeComponent? NextTube(DisposalHolderComponent holder) { var nextDirection = NextDirection(holder); - var snapGrid = Owner.GetComponent(); var oppositeDirection = new Angle(nextDirection.ToAngle().Theta + Math.PI).GetDir(); - foreach (var entity in snapGrid.GetInDir(nextDirection)) + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var position = Owner.Transform.Coordinates; + foreach (var entity in grid.GetInDir(position, nextDirection)) { - if (!entity.TryGetComponent(out IDisposalTubeComponent? tube)) + if (!Owner.EntityManager.ComponentManager.TryGetComponent(entity, out IDisposalTubeComponent? tube)) { continue; } diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs index b0fbafa4e4..cb043e2702 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs @@ -28,6 +28,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Player; using Robust.Shared.Random; @@ -44,6 +45,7 @@ namespace Content.Server.GameObjects.Components.Disposal public class DisposalUnitComponent : SharedDisposalUnitComponent, IInteractHand, IActivate, IInteractUsing, IThrowCollide, IGasMixtureHolder { [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly IMapManager _mapManager = default!; public override string Name => "DisposalUnit"; @@ -260,17 +262,17 @@ namespace Content.Server.GameObjects.Components.Disposal return false; } - var snapGrid = Owner.GetComponent(); - var entry = snapGrid - .GetLocal() - .FirstOrDefault(entity => entity.HasComponent()); + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + var entry = grid.GetLocal(coords) + .FirstOrDefault(entity => Owner.EntityManager.ComponentManager.HasComponent(entity)); - if (entry == null) + if (entry == default) { return false; } - var entryComponent = entry.GetComponent(); + var entryComponent = Owner.EntityManager.ComponentManager.GetComponent(entry); if (Owner.Transform.Coordinates.TryGetTileAtmosphere(out var tileAtmos) && tileAtmos.Air != null && diff --git a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs index a64f11fefa..acb752be08 100644 --- a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs @@ -78,7 +78,6 @@ namespace Content.Server.GameObjects.Components.Fluids private bool _overflown; private SpriteComponent _spriteComponent = default!; - private SnapGridComponent _snapGrid = default!; public ReagentUnit MaxVolume { @@ -112,7 +111,6 @@ namespace Content.Server.GameObjects.Components.Fluids base.Initialize(); _contents = Owner.EnsureComponentWarn(); - _snapGrid = Owner.EnsureComponent(); // Smaller than 1m^3 for now but realistically this shouldn't be hit MaxVolume = ReagentUnit.New(1000); @@ -348,8 +346,9 @@ namespace Content.Server.GameObjects.Components.Fluids puddle = default; var mapGrid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; - if (!Owner.Transform.Coordinates.Offset(direction).TryGetTileRef(out var tile)) + if (!coords.Offset(direction).TryGetTileRef(out var tile)) { return false; } @@ -360,16 +359,19 @@ namespace Content.Server.GameObjects.Components.Fluids return false; } - foreach (var entity in _snapGrid.GetInDir(direction)) + if (!Owner.Transform.Anchored) + return false; + + foreach (var entity in mapGrid.GetInDir(coords, direction)) { - if (entity.TryGetComponent(out IPhysBody? physics) && + if (Owner.EntityManager.ComponentManager.TryGetComponent(entity, out IPhysBody? physics) && (physics.CollisionLayer & (int) CollisionGroup.Impassable) != 0) { puddle = default; return false; } - if (entity.TryGetComponent(out PuddleComponent? existingPuddle)) + if (Owner.EntityManager.ComponentManager.TryGetComponent(entity, out PuddleComponent? existingPuddle)) { if (existingPuddle._overflown) { @@ -382,8 +384,7 @@ namespace Content.Server.GameObjects.Components.Fluids if (puddle == default) { - var grid = _snapGrid.DirectionToGrid(direction); - puddle = () => Owner.EntityManager.SpawnEntity(Owner.Prototype?.ID, grid).GetComponent(); + puddle = () => Owner.EntityManager.SpawnEntity(Owner.Prototype?.ID, mapGrid.DirectionToGrid(coords, direction)).GetComponent(); } return true; diff --git a/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs b/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs index cc11f684d7..8d29c0d697 100644 --- a/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs +++ b/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs @@ -101,7 +101,7 @@ namespace Content.Server.GameObjects.Components.Items.RCD var mapGrid = _mapManager.GetGrid(eventArgs.ClickLocation.GetGridId(Owner.EntityManager)); var tile = mapGrid.GetTileRef(eventArgs.ClickLocation); - var snapPos = mapGrid.SnapGridCellFor(eventArgs.ClickLocation, SnapGridOffset.Center); + var snapPos = mapGrid.TileIndicesFor(eventArgs.ClickLocation); //Using an RCD isn't instantaneous var cancelToken = new CancellationTokenSource(); diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs index 1531dd4d57..7f7f0310b4 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs @@ -8,6 +8,7 @@ using Content.Server.GameObjects.Components.Power.AME; using Robust.Shared.GameObjects; using Robust.Shared.Random; using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups @@ -68,12 +69,13 @@ namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups //Check each shield node to see if it meets core criteria foreach (Node node in Nodes) { - if (!node.Owner.TryGetComponent(out var shield)) { continue; } - var nodeNeighbors = node.Owner - .GetComponent() - .GetCellsInSquareArea() - .Select(sgc => sgc.Owner) - .Where(entity => entity != node.Owner) + var nodeOwner = node.Owner; + if (!nodeOwner.TryGetComponent(out var shield)) { continue; } + + var grid = IoCManager.Resolve().GetGrid(nodeOwner.Transform.GridID); + var nodeNeighbors = grid.GetCellsInSquareArea(nodeOwner.Transform.Coordinates, 1) + .Select(sgc => nodeOwner.EntityManager.GetEntity(sgc)) + .Where(entity => entity != nodeOwner) .Select(entity => entity.TryGetComponent(out var adjshield) ? adjshield : null) .Where(adjshield => adjshield != null); diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs index 33d367bb03..fc17a1c6c9 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs @@ -1,6 +1,7 @@ #nullable enable using System.Collections.Generic; -using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.GameObjects.Components.NodeContainer.Nodes @@ -13,22 +14,27 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes { protected override IEnumerable GetReachableNodes() { - if (!Owner.TryGetComponent(out SnapGridComponent? snap)) + if (!Owner.Transform.Anchored) yield break; - foreach (var cell in snap.GetCardinalNeighborCells()) - foreach (var entity in cell.GetLocal()) + var grid = IoCManager.Resolve().GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + foreach (var cell in grid.GetCardinalNeighborCells(coords)) { - if (!entity.TryGetComponent(out var container)) continue; - - foreach (var node in container.Nodes.Values) + foreach (var entity in grid.GetLocal(Owner.EntityManager.GetEntity(cell).Transform.Coordinates)) { - if (node != null && node != this) - { - yield return node; - } - } + if (!Owner.EntityManager.GetEntity(entity).TryGetComponent(out var container)) + continue; + foreach (var node in container.Nodes.Values) + { + if (node != null && node != this) + { + yield return node; + } + } + + } } } } diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs b/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs index 985d110d74..0218a1b02d 100644 --- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs +++ b/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs @@ -6,6 +6,8 @@ using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Atmos; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -169,14 +171,14 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes /// private IEnumerable PipesInDirection(PipeDirection pipeDir) { - if (!Owner.TryGetComponent(out SnapGridComponent? grid)) + if (!Owner.Transform.Anchored) yield break; - var entities = grid.GetInDir(pipeDir.ToDirection()); - - foreach (var entity in entities) + var grid = IoCManager.Resolve().GetGrid(Owner.Transform.GridID); + var position = Owner.Transform.Coordinates; + foreach (var entity in grid.GetInDir(position, pipeDir.ToDirection())) { - if (!entity.TryGetComponent(out var container)) + if (!Owner.EntityManager.ComponentManager.TryGetComponent(entity, out var container)) continue; foreach (var node in container.Nodes.Values) diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs index 30c336f3f5..d0195877a8 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs @@ -13,8 +13,10 @@ using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Content.Shared.Interfaces.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; +using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; @@ -36,6 +38,8 @@ namespace Content.Server.GameObjects.Components.PA [RegisterComponent] public class ParticleAcceleratorControlBoxComponent : ParticleAcceleratorPartComponent, IActivate, IWires { + [Dependency] private readonly IMapManager _mapManager = default!; + public override string Name => "ParticleAcceleratorControlBox"; [ViewVariables] @@ -378,11 +382,13 @@ namespace Content.Server.GameObjects.Components.PA _partEmitterRight = null; // Find fuel chamber first by scanning cardinals. - if (SnapGrid != null) + if (Owner.Transform.Anchored) { - foreach (var maybeFuel in SnapGrid.GetCardinalNeighborCells()) + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + foreach (var maybeFuel in grid.GetCardinalNeighborCells(coords)) { - if (maybeFuel.Owner.TryGetComponent(out _partFuelChamber)) + if (Owner.EntityManager.ComponentManager.TryGetComponent(maybeFuel, out _partFuelChamber)) { break; } @@ -452,9 +458,11 @@ namespace Content.Server.GameObjects.Components.PA private bool ScanPart(Vector2i offset, [NotNullWhen(true)] out T? part) where T : ParticleAcceleratorPartComponent { - foreach (var ent in SnapGrid!.GetOffset(offset)) + var grid = _mapManager.GetGrid(Owner.Transform.GridID); + var coords = Owner.Transform.Coordinates; + foreach (var ent in grid.GetOffset(coords, offset)) { - if (ent.TryGetComponent(out part) && !part.Deleted) + if (Owner.EntityManager.ComponentManager.TryGetComponent(ent, out part) && !part.Deleted) { return true; } diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs index b74b9de74b..de6c9f56c8 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs @@ -1,6 +1,5 @@ #nullable enable using Robust.Shared.GameObjects; -using Robust.Shared.Log; using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.PA @@ -8,14 +7,13 @@ namespace Content.Server.GameObjects.Components.PA public abstract class ParticleAcceleratorPartComponent : Component { [ViewVariables] public ParticleAcceleratorControlBoxComponent? Master; - [ViewVariables] protected SnapGridComponent? SnapGrid; public override void Initialize() { base.Initialize(); // FIXME: this has to be an entity system, full stop. - Owner.EnsureComponent(out SnapGrid); + Owner.Transform.Anchored = true; } public override void HandleMessage(ComponentMessage message, IComponent? component) diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs b/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs index 8cab4a77d1..e240171357 100644 --- a/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs +++ b/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs @@ -40,8 +40,8 @@ namespace Content.Server.GameObjects.Components.Power.AME if (!_mapManager.TryGetGrid(args.ClickLocation.GetGridId(_serverEntityManager), out var mapGrid)) return false; // No AME in space. - var snapPos = mapGrid.SnapGridCellFor(args.ClickLocation, SnapGridOffset.Center); - if (mapGrid.GetSnapGridCell(snapPos, SnapGridOffset.Center).Any(sc => sc.Owner.HasComponent())) + var snapPos = mapGrid.TileIndicesFor(args.ClickLocation); + if (mapGrid.GetAnchoredEntities(snapPos).Any(sc => _serverEntityManager.ComponentManager.HasComponent(sc))) { Owner.PopupMessage(args.User, Loc.GetString("Shielding is already there!")); return true; diff --git a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs index 33678d16f1..bfb72c9f66 100644 --- a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs @@ -1,4 +1,5 @@ #nullable enable +using System.Collections.Generic; using Content.Server.GameObjects.Components.Stack; using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Utility; @@ -38,13 +39,12 @@ namespace Content.Server.GameObjects.Components.Power return true; if(!_mapManager.TryGetGrid(eventArgs.ClickLocation.GetGridId(Owner.EntityManager), out var grid)) return true; - var snapPos = grid.SnapGridCellFor(eventArgs.ClickLocation, SnapGridOffset.Center); - var snapCell = grid.GetSnapGridCell(snapPos, SnapGridOffset.Center); + var snapPos = grid.TileIndicesFor(eventArgs.ClickLocation); if(grid.GetTileRef(snapPos).Tile.IsEmpty) return true; - foreach (var snapComp in snapCell) + foreach (var anchored in grid.GetAnchoredEntities(snapPos)) { - if (snapComp.Owner.TryGetComponent(out var wire) && wire.WireType == _blockingWireType) + if (Owner.EntityManager.ComponentManager.TryGetComponent(anchored, out var wire) && wire.WireType == _blockingWireType) { return true; } diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs index b6f88e7436..b9ed00390f 100644 --- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs @@ -62,7 +62,8 @@ namespace Content.Server.GameObjects.EntitySystems } // Required for airtight components. - EntityManager.EventBus.SubscribeEvent(EventSource.Local, this, RotateEvent); + SubscribeLocalEvent(RotateEvent); + SubscribeLocalEvent(HandleSnapGridMove); _cfg.OnValueChanged(CCVars.SpaceWind, OnSpaceWindChanged, true); _cfg.OnValueChanged(CCVars.MonstermosEqualization, OnMonstermosEqualizationChanged, true); @@ -72,6 +73,11 @@ namespace Content.Server.GameObjects.EntitySystems _cfg.OnValueChanged(CCVars.ExcitedGroupsSpaceIsAllConsuming, OnExcitedGroupsSpaceIsAllConsumingChanged, true); } + private static void HandleSnapGridMove(EntityUid uid, AirtightComponent component, SnapGridPositionChangedEvent args) + { + component.OnTransformMove(); + } + public bool SpaceWind { get; private set; } public bool MonstermosEqualization { get; private set; } public bool Superconduction { get; private set; } @@ -115,7 +121,8 @@ namespace Content.Server.GameObjects.EntitySystems _mapManager.MapCreated -= OnMapCreated; - EntityManager.EventBus.UnsubscribeEvent(EventSource.Local, this); + UnsubscribeLocalEvent(); + UnsubscribeLocalEvent(HandleSnapGridMove); } private void RotateEvent(RotateEvent ev) diff --git a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs b/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs index 30d3b99d11..0718c5cfca 100644 --- a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs @@ -3,34 +3,41 @@ using JetBrains.Annotations; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Maths; namespace Content.Server.GameObjects.EntitySystems { [UsedImplicitly] internal sealed class PuddleSystem : EntitySystem { + [Dependency] private readonly IMapManager _mapManager = default!; + public override void Initialize() { base.Initialize(); - var mapManager = IoCManager.Resolve(); - mapManager.TileChanged += HandleTileChanged; + _mapManager.TileChanged += HandleTileChanged; } public override void Shutdown() { base.Shutdown(); - var mapManager = IoCManager.Resolve(); - mapManager.TileChanged -= HandleTileChanged; + _mapManager.TileChanged -= HandleTileChanged; } + //TODO: Replace all this with an Unanchored event that deletes the puddle private void HandleTileChanged(object? sender, TileChangedEventArgs eventArgs) { // If this gets hammered you could probably queue up all the tile changes every tick but I doubt that would ever happen. - foreach (var (puddle, snapGrid) in ComponentManager.EntityQuery(true)) + foreach (var puddle in ComponentManager.EntityQuery(true)) { // If the tile becomes space then delete it (potentially change by design) + var puddleTransform = puddle.Owner.Transform; + if(!puddleTransform.Anchored) + continue; + + var grid = _mapManager.GetGrid(puddleTransform.GridID); if (eventArgs.NewTile.GridIndex == puddle.Owner.Transform.GridID && - snapGrid.Position == eventArgs.NewTile.GridIndices && + grid.TileIndicesFor(puddleTransform.Coordinates) == eventArgs.NewTile.GridIndices && eventArgs.NewTile.Tile.IsEmpty) { puddle.Owner.Delete(); diff --git a/Content.Server/GameObjects/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/GameObjects/EntitySystems/SpawnAfterInteractSystem.cs index 07821913a4..3404224cb9 100644 --- a/Content.Server/GameObjects/EntitySystems/SpawnAfterInteractSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/SpawnAfterInteractSystem.cs @@ -4,7 +4,6 @@ using Content.Server.GameObjects.Components.Stack; using Content.Server.GameObjects.EntitySystems.DoAfter; using Content.Server.Utility; using Content.Shared.Interfaces.GameObjects.Components; -using Content.Shared.Maps; using Content.Shared.Utility; using JetBrains.Annotations; using Robust.Shared.GameObjects; @@ -70,12 +69,10 @@ namespace Content.Server.GameObjects.EntitySystems if (component.RemoveOnInteract && component.Owner.TryGetComponent(out stack) && !stack.Use(1)) return; - EntityManager.SpawnEntity(component.Prototype, args.ClickLocation.SnapToGrid(grid, SnapGridOffset.Center)); + EntityManager.SpawnEntity(component.Prototype, args.ClickLocation.SnapToGrid(grid)); if (component.RemoveOnInteract && stack == null && !component.Owner.Deleted) component.Owner.Delete(); - - return; } } } diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs index decd397800..44a1a218b6 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs @@ -74,11 +74,7 @@ namespace Content.Server.GameTicking.GamePresets { continue; } - var profile = ReadyProfiles[player.UserId]; - if (profile.AntagPreferences.Contains(_prototypeManager.Index(TraitorID).Name)) - { - prefList.Add(player); - } + prefList.Add(player); player.AttachedEntity?.EnsureComponent(); } diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index d2d3063bfe..6fe91adcf7 100644 --- a/Content.Server/Physics/Controllers/MoverController.cs +++ b/Content.Server/Physics/Controllers/MoverController.cs @@ -156,9 +156,9 @@ namespace Content.Server.Physics.Controllers // If the coordinates have a FootstepModifier component // i.e. component that emit sound on footsteps emit that sound string? soundCollectionName = null; - foreach (var maybeFootstep in grid.GetSnapGridCell(tile.GridIndices, SnapGridOffset.Center)) + foreach (var maybeFootstep in grid.GetAnchoredEntities(tile.GridIndices)) { - if (maybeFootstep.Owner.TryGetComponent(out FootstepModifierComponent? footstep)) + if (EntityManager.ComponentManager.TryGetComponent(maybeFootstep, out FootstepModifierComponent? footstep)) { soundCollectionName = footstep._soundCollectionName; break; diff --git a/Content.Server/Utility/SnapgridHelper.cs b/Content.Server/Utility/SnapgridHelper.cs index 54655944f0..4c1f630ce1 100644 --- a/Content.Server/Utility/SnapgridHelper.cs +++ b/Content.Server/Utility/SnapgridHelper.cs @@ -7,13 +7,12 @@ namespace Content.Server.Utility { public static class SnapgridHelper { - public static void SnapToGrid(this IEntity entity, SnapGridOffset offset = SnapGridOffset.Center, IEntityManager? entityManager = null, IMapManager? mapManager = null) + public static void SnapToGrid(this IEntity entity, IEntityManager? entityManager = null, IMapManager? mapManager = null) { - entity.Transform.Coordinates = entity.Transform.Coordinates.SnapToGrid(offset, entityManager, mapManager); + entity.Transform.Coordinates = entity.Transform.Coordinates.SnapToGrid(entityManager, mapManager); } - public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, - SnapGridOffset offset = SnapGridOffset.Center, IEntityManager? entityManager = null, IMapManager? mapManager = null) + public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IEntityManager? entityManager = null, IMapManager? mapManager = null) { entityManager ??= IoCManager.Resolve(); mapManager ??= IoCManager.Resolve(); @@ -30,21 +29,20 @@ namespace Content.Server.Utility var localPos = coordinates.Position; - var x = (int)Math.Floor(localPos.X / tileSize) + tileSize / (offset == SnapGridOffset.Center ? 2f : 0f); - var y = (int)Math.Floor(localPos.Y / tileSize) + tileSize / (offset == SnapGridOffset.Center ? 2f : 0f); + var x = (int)Math.Floor(localPos.X / tileSize) + tileSize / 2f; + var y = (int)Math.Floor(localPos.Y / tileSize) + tileSize / 2f; return new EntityCoordinates(coordinates.EntityId, x, y); } - public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IMapGrid grid, - SnapGridOffset offset = SnapGridOffset.Center) + public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, IMapGrid grid) { var tileSize = grid.TileSize; var localPos = coordinates.Position; - var x = (int)Math.Floor(localPos.X / tileSize) + tileSize / (offset == SnapGridOffset.Center ? 2f : 0f); - var y = (int)Math.Floor(localPos.Y / tileSize) + tileSize / (offset == SnapGridOffset.Center ? 2f : 0f); + var x = (int)Math.Floor(localPos.X / tileSize) + tileSize / 2f; + var y = (int)Math.Floor(localPos.Y / tileSize) + tileSize / 2f; return new EntityCoordinates(coordinates.EntityId, x, y); } diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs index 65bfd5d2d2..c455b7a053 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs @@ -70,6 +70,12 @@ namespace Content.Shared.GameObjects.Components.Chemistry public bool CanRefill => Capabilities.HasCap(SolutionContainerCaps.Refillable); public bool CanDrain => Capabilities.HasCap(SolutionContainerCaps.Drainable); + public override void Initialize() + { + base.Initialize(); + UpdateAppearance(); + } + public void RemoveAllSolution() { if (CurrentVolume == 0) diff --git a/Content.Shared/GameObjects/EntitySystems/SubFloorHideSystem.cs b/Content.Shared/GameObjects/EntitySystems/SubFloorHideSystem.cs index 0f60fbb50e..be25aeea2e 100644 --- a/Content.Shared/GameObjects/EntitySystems/SubFloorHideSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SubFloorHideSystem.cs @@ -36,12 +36,11 @@ namespace Content.Shared.GameObjects.EntitySystems private void UpdateAll() { - foreach (var comp in EntityManager.ComponentManager.EntityQuery(true)) + foreach (var comp in ComponentManager.EntityQuery(true)) { - if (!_mapManager.TryGetGrid(comp.Owner.Transform.GridID, out var grid)) return; - - var snapPos = comp.Owner.GetComponent(); - UpdateTile(grid, snapPos.Position); + var transform = comp.Owner.Transform; + if (!_mapManager.TryGetGrid(transform.GridID, out var grid)) return; + UpdateTile(grid, grid.TileIndicesFor(transform.Coordinates)); } } @@ -119,22 +118,21 @@ namespace Content.Shared.GameObjects.EntitySystems { var tile = grid.GetTileRef(position); var tileDef = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId]; - foreach (var snapGridComponent in grid.GetSnapGridCell(position, SnapGridOffset.Center)) + foreach (var anchored in grid.GetAnchoredEntities(position)) { - var entity = snapGridComponent.Owner; - if (!entity.TryGetComponent(out SubFloorHideComponent? subFloorComponent)) + if (!ComponentManager.TryGetComponent(anchored, out SubFloorHideComponent? subFloorComponent)) { continue; } // Show sprite - if (entity.TryGetComponent(out SharedSpriteComponent? spriteComponent)) + if (ComponentManager.TryGetComponent(anchored, out SharedSpriteComponent ? spriteComponent)) { spriteComponent.Visible = ShowAll || !subFloorComponent.Running || tileDef.IsSubFloor; } // So for collision all we care about is that the component is running. - if (entity.TryGetComponent(out PhysicsComponent? physicsComponent)) + if (ComponentManager.TryGetComponent(anchored, out PhysicsComponent ? physicsComponent)) { physicsComponent.CanCollide = !subFloorComponent.Running; } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs index 4b76747e35..51c8ddccc7 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs @@ -18,6 +18,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// /// Called when this component is activated by another entity who is in range. /// + [Obsolete("Use ActivateInWorldMessage instead")] void Activate(ActivateEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs index b5fd2ea5c7..4898f827f9 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs @@ -27,6 +27,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// /// Called when we interact with nothing, or when we interact with an entity out of range that has no behavior /// + [Obsolete("Use AfterInteractMessage instead")] Task AfterInteract(AfterInteractEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs index 8c60e71ad6..822adb96db 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs @@ -14,7 +14,10 @@ namespace Content.Shared.Interfaces.GameObjects.Components public interface IAttack { // Redirects to ClickAttack by default. + [Obsolete("WideAttack")] bool WideAttack(AttackEventArgs eventArgs) => ClickAttack(eventArgs); + + [Obsolete("Use ClickAttack instead")] bool ClickAttack(AttackEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs index 2f527ba032..e4d68088b5 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs @@ -12,6 +12,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components [RequiresExplicitImplementation] public interface IDropped { + [Obsolete("Use DroppedMessage instead")] void Dropped(DroppedEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs index a050b90659..c1f6225e3a 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs @@ -18,6 +18,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components [RequiresExplicitImplementation] public interface IEquipped { + [Obsolete("Use EquippedMessage instead")] void Equipped(EquippedEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs index 4d42c4ba77..31adf0aef8 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs @@ -1,4 +1,5 @@ #nullable enable +using System; using Content.Shared.GameObjects.Components.Items; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -15,6 +16,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components [RequiresExplicitImplementation] public interface IEquippedHand { + [Obsolete("Use EquippedHandMessage instead")] void EquippedHand(EquippedHandEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs index 39fb21b8d9..e24c70c876 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs @@ -12,6 +12,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components [RequiresExplicitImplementation] public interface IHandDeselected { + [Obsolete("Use HandDeselectedMessage instead")] void HandDeselected(HandDeselectedEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs index d4d833699f..734162718c 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs @@ -12,6 +12,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components [RequiresExplicitImplementation] public interface IHandSelected { + [Obsolete("Use HandSelectedMessage instead")] void HandSelected(HandSelectedEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs index 51de4b1da4..65e903e957 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs @@ -15,6 +15,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// /// Called when a player directly interacts with an empty hand when user is in range of the target entity. /// + [Obsolete("Use AttackHandMessage instead")] bool InteractHand(InteractHandEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs index 9b19336466..43c3ecbcaa 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs @@ -24,6 +24,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// /// Called when using one object on another when user is in range of the target entity. /// + [Obsolete("Use InteractUsingMessage instead")] Task InteractUsing(InteractUsingEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs index c0a94f8702..20b059ba87 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs @@ -16,7 +16,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// /// Called when we try to interact with an entity out of range /// - /// + [Obsolete("Use RangedInteractMessage instead")] bool RangedInteract(RangedInteractEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs index db4812420f..2ec23d6e1e 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs @@ -12,6 +12,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components [RequiresExplicitImplementation] public interface IThrown { + [Obsolete("Use ThrownMessage instead")] void Thrown(ThrownEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs index cbde9c578e..88068f24c6 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs @@ -1,4 +1,5 @@ #nullable enable +using System; using Content.Shared.GameObjects.Components.Inventory; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -17,6 +18,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components [RequiresExplicitImplementation] public interface IUnequipped { + [Obsolete("Use UnequippedMessage instead")] void Unequipped(UnequippedEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs index 3a62406af9..7178543036 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs @@ -1,4 +1,5 @@ #nullable enable +using System; using Content.Shared.GameObjects.Components.Items; using JetBrains.Annotations; using Robust.Shared.Analyzers; @@ -14,6 +15,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components [RequiresExplicitImplementation] public interface IUnequippedHand { + [Obsolete("Use UnequippedHandMessage instead")] void UnequippedHand(UnequippedHandEventArgs eventArgs); } diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs index 8dc45ade88..2fd2f774bc 100644 --- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs +++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs @@ -16,6 +16,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components /// Called when we activate an object we are holding to use it /// /// + [Obsolete("Use UseInHandMessage instead")] bool UseEntity(UseEntityEventArgs eventArgs); } diff --git a/Resources/Audio/Lobby/atomicamnesiammx.ogg b/Resources/Audio/Lobby/atomicamnesiammx.ogg index b39e73571e..4e126bd5d8 100644 Binary files a/Resources/Audio/Lobby/atomicamnesiammx.ogg and b/Resources/Audio/Lobby/atomicamnesiammx.ogg differ diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 513eab7da7..f4b6dde536 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -947,3 +947,13 @@ Entries: - {message: Fix footstep sounds exception, type: Fix} id: 169 time: '2021-04-21T10:14:40.0000000+00:00' +- author: TaralGit + changes: + - {message: (Re)Added the machete and the baseball bat (melee weapons)., type: Add} + - {message: Added inhands for the beaker and large beaker., type: Add} + - {message: minor changes to the laser gun sprite and mag-unshaded files., type: Fix} + - {message: 'reworked the inhands for the homemade pistol, clarissa, giskard and + mk58 (both variants),', type: Fix} + - {message: nerfed melee weapons, type: Fix} + id: 170 + time: '2021-04-28T21:14:28.0000000+00:00' diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index f08edb5fcd..4660f9b783 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml @@ -7,7 +7,6 @@ ButchCleaver: 1 KitchenKnife: 5 DrinkGlass: 10 - DrinkPitcher: 1 DrinkMug: 5 DrinkMugBlack: 2 DrinkMugBlue: 2 @@ -18,4 +17,3 @@ DrinkMugOne: 1 DrinkMugRainbow: 2 DrinkMugRed: 2 - diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml index ecc22bc20c..c5461290ce 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml @@ -104,7 +104,6 @@ - type: Anchorable - type: Pullable - type: SnapGrid - offset: Center - type: Damageable resistances: metallicResistances - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml index 91184af423..13dc19c8f4 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/catwalk.yml @@ -22,7 +22,6 @@ sprite: Constructible/Tiles/catwalk.rsi state: catwalk_preview - type: SnapGrid - offset: Center - type: IconSmooth key: catwalk base: catwalk_ diff --git a/Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml b/Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml index 67ca24b4e9..6071b39208 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/gascanisterports.yml @@ -8,7 +8,6 @@ - type: InteractionOutline - type: Physics - type: SnapGrid - offset: Center - type: Sprite netsync: false sprite: Constructible/Atmos/gascanisterport.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml b/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml index e26a09a671..9cdb40b525 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/gascanisters.yml @@ -7,7 +7,6 @@ components: - type: InteractionOutline - type: SnapGrid - offset: Center - type: Sprite - type: Damageable resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml b/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml index 2dd1daf7fa..72169c0f62 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/gasfilters.yml @@ -8,7 +8,6 @@ - type: InteractionOutline - type: Physics - type: SnapGrid - offset: Center - type: Damageable resistances: metallicResistances - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml b/Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml index a67bf0261f..866a2b1ce2 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml @@ -22,7 +22,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: GasGenerator - type: PipeNetDevice diff --git a/Resources/Prototypes/Entities/Constructible/Piping/heaters.yml b/Resources/Prototypes/Entities/Constructible/Piping/heaters.yml index ce0c261902..b54397ab50 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/heaters.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/heaters.yml @@ -9,7 +9,6 @@ - type: InteractionOutline - type: Physics - type: SnapGrid - offset: Center - type: Damageable - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml b/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml index 28e6e79347..5a8f4900e3 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/pipes.yml @@ -10,7 +10,6 @@ - type: InteractionOutline - type: Physics - type: SnapGrid - offset: Center - type: Damageable - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml b/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml index 034174141e..1e66dc6370 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/pumps.yml @@ -8,7 +8,6 @@ - type: InteractionOutline - type: Physics - type: SnapGrid - offset: Center - type: Damageable resistances: metallicResistances - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml b/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml index 23547d4a13..6d0f2810ab 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/scrubbers.yml @@ -8,7 +8,6 @@ - type: InteractionOutline - type: Physics - type: SnapGrid - offset: Center - type: Damageable resistances: metallicResistances - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Piping/vents.yml b/Resources/Prototypes/Entities/Constructible/Piping/vents.yml index 25b36842e5..f626eb112d 100644 --- a/Resources/Prototypes/Entities/Constructible/Piping/vents.yml +++ b/Resources/Prototypes/Entities/Constructible/Piping/vents.yml @@ -8,7 +8,6 @@ - type: InteractionOutline - type: Physics - type: SnapGrid - offset: Center - type: Damageable resistances: metallicResistances - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml index 545177280a..34a85b5ad2 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/controller.yml @@ -41,7 +41,6 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: SnapGrid - offset: Center - type: Anchorable - type: Pullable - type: AMEController diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml index e43b7dfae3..c0bcc8e5e4 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/AME/shielding.yml @@ -37,7 +37,6 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: SnapGrid - offset: Center - type: IconSmooth mode: CardinalFlags base: shield_ diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/base.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/base.yml index 1fee8ae412..fa139ca653 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/base.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/PA/base.yml @@ -19,6 +19,5 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: Pullable - type: Clickable diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml index fac3c7d61b..c1f99b06d9 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/collector.yml @@ -24,7 +24,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/Singularity/collector.rsi layers: diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml index 0db38430b9..4488cbb3bf 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/containment.yml @@ -24,7 +24,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/Singularity/containment.rsi state: icon @@ -66,7 +65,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/Singularity/containment_field.rsi state: field diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml index c8634d7ed6..1067d20264 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/emitter.yml @@ -24,7 +24,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/Singularity/emitter.rsi layers: diff --git a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml index 5e22b4820c..187cf53c9d 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Engines/Singularity/generator.yml @@ -23,6 +23,5 @@ mask: - MobImpassable - type: SnapGrid - offset: Center - type: Anchorable - type: Pullable diff --git a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml b/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml index 85f0922d25..45091750d8 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Generation/generator.yml @@ -26,7 +26,6 @@ - VaultImpassable - SmallImpassable - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/power.rsi state: generator diff --git a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml index c37be3e41f..9f852d0c9a 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Generation/solar.yml @@ -35,7 +35,6 @@ - type: SolarPanel supply: 1500 - type: SnapGrid - offset: Center - type: Damageable resistances: metallicResistances - type: Destructible @@ -78,7 +77,6 @@ sprite: Constructible/Power/solar_panel.rsi state: solar_assembly - type: SnapGrid - offset: Center - type: Damageable resistances: metallicResistances - type: Destructible @@ -123,7 +121,6 @@ sprite: Constructible/Power/solar_panel.rsi state: solar_tracker - type: SnapGrid - offset: Center - type: Damageable resistances: metallicResistances - type: Destructible diff --git a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml b/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml index 244baac4b0..963521c356 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/Specific/debug_power.yml @@ -19,7 +19,6 @@ bounds: "-0.5, -0.5, 0.5, 0.5" layer: [MobMask, Opaque] - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/power.rsi state: wiredmachine @@ -58,7 +57,6 @@ bounds: "-0.5, -0.5, 0.5, 0.5" layer: [MobMask, Opaque] - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/power.rsi state: provider @@ -88,7 +86,6 @@ bounds: "-0.5, -0.5, 0.5, 0.5" layer: [MobMask, Opaque] - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/power.rsi state: provider @@ -133,7 +130,6 @@ bounds: "-0.5, -0.5, 0.5, 0.5" layer: [MobMask, Opaque] - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/power.rsi state: wirelessmachine diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index dece3752fe..853125eb61 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -22,7 +22,6 @@ - Opaque - MobImpassable - type: SnapGrid - offset: Center - type: Lathe - type: MaterialStorage - type: Anchorable diff --git a/Resources/Prototypes/Entities/Constructible/Power/parts.yml b/Resources/Prototypes/Entities/Constructible/Power/parts.yml index f77824bfc4..98f6969595 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/parts.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/parts.yml @@ -25,7 +25,6 @@ - VaultImpassable - SmallImpassable - type: SnapGrid - offset: Center - type: Sprite netsync: false sprite: Constructible/Power/smes.rsi @@ -85,7 +84,6 @@ - VaultImpassable - SmallImpassable - type: SnapGrid - offset: Center - type: Sprite sprite: Constructible/Power/substation.rsi layers: @@ -139,7 +137,6 @@ bounds: "-0.25, -0.25, 0.25, 0.3" layer: [ Passable ] - type: SnapGrid - offset: Center - type: Sprite drawdepth: WallMountedItems netsync: false diff --git a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml b/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml index 262729b4e2..99bfc821e7 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml @@ -23,7 +23,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: Anchorable - type: SeedExtractor - type: PowerReceiver diff --git a/Resources/Prototypes/Entities/Constructible/Power/wires.yml b/Resources/Prototypes/Entities/Constructible/Power/wires.yml index 8452181b80..41d8c088cd 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/wires.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/wires.yml @@ -14,7 +14,6 @@ - Underplating - type: InteractionOutline - type: SnapGrid - offset: Center - type: Sprite drawdepth: BelowFloor - type: IconSmooth @@ -166,7 +165,6 @@ mode: SnapgridCenter components: - type: SnapGrid - offset: Center - type: Sprite drawdepth: BelowFloor - type: IconSmooth diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml index 16f3244d5a..3fe0e117cf 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml @@ -20,7 +20,6 @@ - VaultImpassable - SmallImpassable - type: SnapGrid - offset: Center - type: Sprite netsync: false sprite: Constructible/Power/conveyor.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Cooking/microwave.yml b/Resources/Prototypes/Entities/Constructible/Specific/Cooking/microwave.yml index 66d1630218..6a22095168 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Cooking/microwave.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Cooking/microwave.yml @@ -6,7 +6,6 @@ mode: SnapgridCenter components: - type: SnapGrid - offset: Center - type: Microwave - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Cooking/reagent_grinder.yml b/Resources/Prototypes/Entities/Constructible/Specific/Cooking/reagent_grinder.yml index 6ddb1f1e19..5d8fa6511a 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Cooking/reagent_grinder.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Cooking/reagent_grinder.yml @@ -7,7 +7,6 @@ mode: SnapgridCenter components: - type: SnapGrid - offset: Center - type: ReagentGrinder - type: UserInterface interfaces: diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml index 4b49fe4325..a542c67926 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml @@ -24,7 +24,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: ReagentDispenser - type: PowerReceiver - type: UserInterface diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml b/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml index 7fe6868252..c96ac62bc2 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml @@ -28,7 +28,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: CloningPod - type: Damageable resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml index cab60850f8..7c7d477780 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml @@ -27,7 +27,6 @@ - Impassable - VaultImpassable - type: SnapGrid - offset: Center - type: Anchorable - type: Pullable - type: MedicalScanner diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml index 941ac6d1a6..af4fa47dae 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Medical/morgue.yml @@ -48,7 +48,6 @@ light_mob: morgue_nosoul_light light_soul: morgue_soul_light - type: SnapGrid - offset: Center - type: entity id: MorgueTray @@ -115,7 +114,6 @@ light_contents: crema_contents_light light_burning: crema_active_light - type: SnapGrid - offset: Center - type: entity id: CrematoriumTray diff --git a/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml b/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml index a0cf7818c3..87c97b4e92 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml @@ -11,7 +11,6 @@ - type: Physics bodyType: Static - type: SnapGrid - offset: Center - type: Anchorable - type: Damageable resistances: metallicResistances @@ -399,7 +398,6 @@ - VaultImpassable - SmallImpassable - type: SnapGrid - offset: Center - type: Anchorable - type: Damageable resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml index f22aa08a90..4708e06aee 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml @@ -14,7 +14,6 @@ shader: unshaded map: ["enum.GravityGeneratorVisualLayers.Core"] - type: SnapGrid - offset: Center - type: PowerReceiver powerLoad: 500 - type: Physics diff --git a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml index e6fa7387bc..906b1bfe06 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml @@ -44,7 +44,6 @@ maxVol: 200 caps: Refillable - type: SnapGrid - offset: Center - type: Reactive reactions: - !type:AddToSolutionReaction diff --git a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml b/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml index 83ce876c87..419981a1d1 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/recycler.yml @@ -19,7 +19,6 @@ - MobImpassable - VaultImpassable - type: SnapGrid - offset: Center - type: Sprite netsync: false sprite: Constructible/Power/recycling.rsi diff --git a/Resources/Prototypes/Entities/Constructible/base.yml b/Resources/Prototypes/Entities/Constructible/base.yml index d97ca3971b..854f535d34 100644 --- a/Resources/Prototypes/Entities/Constructible/base.yml +++ b/Resources/Prototypes/Entities/Constructible/base.yml @@ -5,7 +5,6 @@ mode: SnapgridCenter components: - type: SnapGrid - offset: Center - type: Clickable - type: Physics bodyType: Static diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index 71f75f2ad1..0776e99ed8 100644 --- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml +++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml @@ -12,7 +12,6 @@ - type: SmokeVisualizer - type: Occluder - type: SnapGrid - offset: Center - type: SmokeSolutionAreaEffect - type: SolutionContainer maxVol: 600 @@ -38,7 +37,6 @@ animationTime: 0.6 animationState: foam-dissolve - type: SnapGrid - offset: Center - type: Physics fixtures: - shape: @@ -118,7 +116,6 @@ sizeX: 32 sizeY: 32 - type: SnapGrid - offset: Center - type: Airtight - type: Damageable resistances: metallicResistances diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index a161cd7aae..007a55daff 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -4,7 +4,6 @@ abstract: true components: - type: SnapGrid - offset: Center - type: Sprite drawdepth: FloorObjects - type: SolutionContainer diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml index 5221581a2c..19e12c64a4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml @@ -13,7 +13,6 @@ - type: Drink - type: Sprite state: icon - - type: Spillable - type: entity @@ -45,7 +44,6 @@ - type: DamageOtherOnHit amount: 5 - # Transformable container - normal glass - type: entity name: Drinking glass @@ -76,7 +74,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/aleglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkAntifreeze @@ -93,7 +90,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/antifreeze.rsi - - type: entity parent: DrinkGlassBase id: DrinkAtomicbombglass @@ -110,7 +106,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/atomicbombglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkB52Glass @@ -127,7 +122,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/b52glass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBananahonkglass @@ -138,7 +132,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/bananahonkglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBeepskySmashGlass @@ -149,7 +142,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBeer @@ -165,7 +157,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/beer.rsi - - type: entity parent: DrinkGlassBase id: DrinkBeerglass @@ -181,7 +172,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/beerglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBerryJuice @@ -198,7 +188,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/berryjuice.rsi - - type: entity parent: DrinkGlassBase id: DrinkBlackRussianGlass @@ -209,7 +198,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/blackrussianglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBloodyMaryGlass @@ -220,7 +208,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBooger @@ -231,7 +218,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/booger.rsi - - type: entity parent: DrinkGlassBase id: DrinkBraveBullGlass @@ -242,7 +228,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/bravebullglass.rsi - - type: entity parent: DrinkGlassBase id: DrinkBrownStar @@ -253,7 +238,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/brownstar.rsi - - type: entity parent: DrinkGlassBase id: DrinkCarafe @@ -265,11 +249,6 @@ sprite: Objects/Consumable/Drinks/carafe.rsi state: icon-10 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 11 - - type: entity parent: DrinkGlassBase id: DrinkCarrotJuice @@ -286,7 +265,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/carrotjuice.rsi - - type: entity parent: DrinkGlassBase id: DrinkChocolateGlass @@ -1730,11 +1708,6 @@ sprite: Objects/Consumable/Drinks/water_cup.rsi state: icon-1 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 2 - - type: entity parent: DrinkGlassBase id: DrinkWhiskeyColaGlass @@ -1814,4 +1787,3 @@ Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/wineglass.rsi - diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml index f9176f5fdc..2122b384d9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml @@ -13,7 +13,6 @@ isOpen: true - type: Sprite state: icon - - type: Spillable - type: entity @@ -27,24 +26,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/golden_cup.rsi - -- type: entity - parent: DrinkBaseCup - id: DrinkPitcher - name: insulated pitcher - description: A stainless steel insulated pitcher. Everyone's best friend in the morning. - components: - - type: SolutionContainer - maxVol: 15 - - type: Sprite - sprite: Objects/Consumable/Drinks/pitcher.rsi - state: icon-6 - - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 7 - - type: entity parent: DrinkBaseCup id: DrinkMug @@ -57,11 +38,6 @@ sprite: Objects/Consumable/Drinks/mug.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugBlack @@ -74,11 +50,6 @@ sprite: Objects/Consumable/Drinks/mug_black.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugBlue @@ -91,11 +62,6 @@ sprite: Objects/Consumable/Drinks/mug_blue.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugGreen @@ -108,11 +74,6 @@ sprite: Objects/Consumable/Drinks/mug_green.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugHeart @@ -125,11 +86,6 @@ sprite: Objects/Consumable/Drinks/mug_heart.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugMetal @@ -142,11 +98,6 @@ sprite: Objects/Consumable/Drinks/mug_metal.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugMoebius @@ -159,11 +110,6 @@ sprite: Objects/Consumable/Drinks/mug_moebius.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugOne @@ -176,11 +122,6 @@ sprite: Objects/Consumable/Drinks/mug_one.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugRainbow @@ -193,11 +134,6 @@ sprite: Objects/Consumable/Drinks/mug_rainbow.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkMugRed @@ -210,11 +146,6 @@ sprite: Objects/Consumable/Drinks/mug_red.rsi state: icon-3 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 4 - - type: entity parent: DrinkBaseCup id: DrinkHotCoco @@ -225,7 +156,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/hot_coco.rsi - - type: entity parent: DrinkBaseCup id: DrinkHotCoffee @@ -241,7 +171,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/hot_coffee.rsi - - type: entity parent: DrinkBaseCup id: DrinkTeacup @@ -258,11 +187,6 @@ sprite: Objects/Consumable/Drinks/teacup.rsi state: icon-1 - - type: Appearance - visuals: - - type: DrinkFoodVisualizer - steps: 2 - - type: entity parent: DrinkBaseCup id: DrinkLean @@ -278,6 +202,5 @@ - type: Sprite sprite: Objects/Consumable/Drinks/lean.rsi state: icon - - type: Item sprite: Objects/Consumable/Drinks/lean.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_solutioncontainerexample.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_solutioncontainerexample.yml new file mode 100644 index 0000000000..66421c05c7 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_solutioncontainerexample.yml @@ -0,0 +1,59 @@ +# For empty check out chemistry bottles + +# With cut-out + +- type: entity + parent: DrinkBaseCup + id: DrinkVisualizerTestCut + name: solution container vis cut-out + description: A stainless steel insulated pitcher. Everyone's best friend in the morning. + components: + - type: SolutionContainer + maxVol: 30 + contents: + reagents: + - ReagentId: WatermelonJuice + Quantity: 30 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Drinks/pitcher.rsi + layers: + - state: icon + - state: fill-6 + map: ["enum.SolutionContainerLayers.Fill"] + # REMEMBER IF YOU'RE SPAWNING WITH LIQUID ALREADY IN IT YOU WANT THIS TRUE + visible: true + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: fill- + +# Without (For food, non cut-out stuff) + +- type: entity + parent: DrinkBaseCup + id: DrinkVisualizerTestNot + name: solution container vis cut-not + description: A stainless steel insulated pitcher. Everyone's best friend in the morning. + components: + - type: SolutionContainer + maxVol: 30 + contents: + reagents: + - ReagentId: WatermelonJuice + Quantity: 30 + - type: Sprite + netsync: false + sprite: Objects/Consumable/Drinks/pitcher.rsi + layers: + - state: icon-6 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - type: Appearance + visuals: + - type: SolutionContainerVisualizer + maxFillLevels: 6 + fillBaseName: icon- + changeColor: false + emptySpriteName: icon diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index ee7ddac006..d24f573809 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -264,7 +264,7 @@ - type: entity parent: MaterialBase id: MaterialHideCorgi - name: corgi hid + name: corgi hide components: - type: Sprite sprite: Objects/Materials/materials.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index c00aa0dfa7..0902861684 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -17,7 +17,6 @@ Slots: - neck - type: SnapGrid - offset: Center - type: entity id: BedsheetBlack diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml index bb25fbabd0..24d9ca9ab3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml @@ -35,6 +35,5 @@ doAfter: 3 - type: Airtight - type: SnapGrid - offset: Center placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml b/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml deleted file mode 100644 index f53b0053bc..0000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/teleporters.yml +++ /dev/null @@ -1,63 +0,0 @@ -- type: entity - name: "basehandtele" - parent: BaseItem - id: BaseHandTele - abstract: true - components: - - type: Sprite - netsync: false - sprite: Objects/Misc/hand_tele.rsi - state: ready - - type: ItemTeleporter - teleporter_type: Random - - type: Item - size: 12 - sprite: Objects/Misc/hand_tele.rsi - - type: LoopingSound - - type: Appearance - visuals: - - type: HandTeleporterVisualizer - -- type: entity - name: "hand teleporter - random" - parent: BaseHandTele - id: RandHandTele - description: "Travel to a random spot in range" - components: - - type: ItemTeleporter - teleporter_type: Random - range: 15 - cooldown: 5 - charge_time: 1 - -- type: entity - name: "hand teleporter - direct" - parent: BaseHandTele - id: DirHandTele - description: "Travel to a specific spot in a short range." - components: - - type: ItemTeleporter - teleporter_type: Directed - range: 5 - cooldown: 2 - charge_time: 0.2 - -- type: entity - name: portal - id: Portal - abstract: true - description: "Portal to another location." - components: - - type: Physics - fixtures: - - shape: - !type:PhysShapeAabb {} - mask: [Impassable, MobImpassable] - - type: Portal - - type: Sprite - netsync: false - sprite: "Effects/portal.rsi" - state: portal-pending - - type: Appearance - visuals: - - type: PortalVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml index a461c327ce..f3a7fa07e0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml @@ -114,7 +114,7 @@ name: lemon parent: ProduceBase id: FoodLemon - description: When life gives you lemons, be grateful they aren't limes + description: When life gives you lemons, be grateful they aren't limes. components: - type: Food - type: SolutionContainer diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml index 5241d2d310..2226d60bbd 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -58,7 +58,6 @@ abstract: true components: - type: SnapGrid - offset: Center - type: SolutionContainer maxVol: 50 - type: Vapor diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index d9afefcf83..3e6b96aa1d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -44,6 +44,8 @@ - state: beakerlarge1 map: ["enum.SolutionContainerLayers.Fill"] visible: false + - type: Item + sprite: Objects/Specific/Chemistry/beaker_large.rsi - type: SolutionContainer maxVol: 100 - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml new file mode 100644 index 0000000000..10e1e05e5e --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -0,0 +1,15 @@ +- type: entity + name: baseball bat + parent: BaseItem + id: BaseBallBat + description: A robust baseball bat. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/baseball_bat.rsi + state: icon + - type: MeleeWeapon + damage: 20 + - type: Item + size: 24 + sprite: Objects/Weapons/Melee/baseball_bat.rsi + prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml deleted file mode 100644 index 590dfafd2d..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/captain_sabre.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - name: captain's sabre - parent: BaseItem - id: CaptainSabre - description: A ceremonial weapon given to the captain of the station. - components: - - type: Sprite - sprite: Objects/Weapons/Melee/captain_sabre.rsi - state: icon - - type: MeleeWeapon - damage: 20 - - type: Item - size: 15 - sprite: Objects/Weapons/Melee/captain_sabre.rsi - prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index d77663a6ad..04f610d3b1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -8,7 +8,7 @@ sprite: Objects/Weapons/Melee/fireaxe.rsi state: icon - type: MeleeWeapon - damage: 30 + damage: 25 - type: Item size: 24 sprite: Objects/Weapons/Melee/fireaxe.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml deleted file mode 100644 index 441281db21..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/katana.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - name: katana - parent: BaseItem - id: Katana - description: Ancient craftwork made with not so ancient plasteel. - components: - - type: Sprite - sprite: Objects/Weapons/Melee/katana.rsi - state: icon - - type: MeleeWeapon - damage: 30 - - type: Item - size: 15 - sprite: Objects/Weapons/Melee/katana.rsi - prefix: inhand diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index bee6ecc1c7..f26e4bd96d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -43,7 +43,7 @@ state: butch - type: MeleeWeapon - damage: 20 + damage: 15 - type: Item size: 10 sprite: Objects/Weapons/Melee/cleaver.rsi @@ -60,7 +60,7 @@ size: 2 state: icon - type: MeleeWeapon - damage: 20 + damage: 15 - type: Item size: 10 sprite: Objects/Weapons/Melee/combat_knife.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml new file mode 100644 index 0000000000..ed628e9801 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -0,0 +1,47 @@ +- type: entity + name: captain's sabre + parent: BaseItem + id: CaptainSabre + description: A ceremonial weapon belonging to the captain of the station. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/captain_sabre.rsi + state: icon + - type: MeleeWeapon + damage: 15 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/captain_sabre.rsi + prefix: inhand + +- type: entity + name: katana + parent: BaseItem + id: Katana + description: Ancient craftwork made with not so ancient plasteel. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/katana.rsi + state: icon + - type: MeleeWeapon + damage: 25 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/katana.rsi + prefix: inhand + +- type: entity + name: machete + parent: BaseItem + id: Machete + description: A large, vicious looking blade. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/machete.rsi + state: icon + - type: MeleeWeapon + damage: 20 + - type: Item + size: 15 + sprite: Objects/Weapons/Melee/machete.rsi + prefix: inhand diff --git a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json index dbc5e2045f..130495918e 100644 --- a/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json +++ b/Resources/Textures/Constructible/Hydroponics/overlays.rsi/meta.json @@ -50,7 +50,7 @@ ] }, { - "name": "alert3" + "name": "lownutri" }, { "name": "lownutri3", diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-1.png new file mode 100644 index 0000000000..63f4f8d6e3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-2.png new file mode 100644 index 0000000000..881a506db8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-3.png new file mode 100644 index 0000000000..9f70ab226d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-4.png new file mode 100644 index 0000000000..3ae4758e01 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-5.png new file mode 100644 index 0000000000..4e292daf6a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-6.png new file mode 100644 index 0000000000..4470f65054 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/fill-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-0.png rename to Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json index f645b06fff..b7a6eeee38 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json @@ -1,32 +1,50 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/d23125a1b04ef77c00da9e7aa7110835672077bb", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", - "states": [ - { - "name": "icon-0" - }, - { - "name": "icon-1" - }, - { - "name": "icon-2" - }, - { - "name": "icon-3" - }, - { - "name": "icon-4" - }, - { - "name": "icon-5" - }, - { - "name": "icon-6" - } - ] -} \ No newline at end of file + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "icon-4" + }, + { + "name": "icon-5" + }, + { + "name": "icon-6" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "fill-6" + } + ] +} diff --git a/Resources/Textures/Objects/Devices/aicard.rsi/aicard-404.png b/Resources/Textures/Objects/Devices/aicard.rsi/aicard-404.png deleted file mode 100644 index 645d236997..0000000000 Binary files a/Resources/Textures/Objects/Devices/aicard.rsi/aicard-404.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/aicard.rsi/aicard-full.png b/Resources/Textures/Objects/Devices/aicard.rsi/aicard-full.png deleted file mode 100644 index 4786cc0faa..0000000000 Binary files a/Resources/Textures/Objects/Devices/aicard.rsi/aicard-full.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/aicard.rsi/aicard-on.png b/Resources/Textures/Objects/Devices/aicard.rsi/aicard-on.png deleted file mode 100644 index d668f51bb1..0000000000 Binary files a/Resources/Textures/Objects/Devices/aicard.rsi/aicard-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/aicard.rsi/aicard.png b/Resources/Textures/Objects/Devices/aicard.rsi/aicard.png deleted file mode 100644 index 22b37682ae..0000000000 Binary files a/Resources/Textures/Objects/Devices/aicard.rsi/aicard.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/aicard.rsi/meta.json b/Resources/Textures/Objects/Devices/aicard.rsi/meta.json deleted file mode 100644 index 376781422b..0000000000 --- a/Resources/Textures/Objects/Devices/aicard.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"aicard","directions":1,"delays":[[1]]},{"name":"aicard-404","directions":1,"delays":[[1]]},{"name":"aicard-full","directions":1,"delays":[[1]]},{"name":"aicard-on","directions":1,"delays":[[1]]}]} diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json index 92f3f76759..f38c05ba60 100644 --- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json @@ -1 +1,74 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"cart","directions":1,"delays":[[1]]},{"name":"cart-a","directions":1,"delays":[[1]]},{"name":"cart-b","directions":1,"delays":[[1]]},{"name":"cart-c","directions":1,"delays":[[1]]},{"name":"cart-ce","directions":1,"delays":[[1]]},{"name":"cart-chem","directions":1,"delays":[[1]]},{"name":"cart-clown","directions":1,"delays":[[1]]},{"name":"cart-cmo","directions":1,"delays":[[1]]},{"name":"cart-e","directions":1,"delays":[[1]]},{"name":"cart-eye","directions":1,"delays":[[1]]},{"name":"cart-h","directions":1,"delays":[[1]]},{"name":"cart-hos","directions":1,"delays":[[1]]},{"name":"cart-j","directions":1,"delays":[[1]]},{"name":"cart-lib","directions":1,"delays":[[1]]},{"name":"cart-m","directions":1,"delays":[[1]]},{"name":"cart-mi","directions":1,"delays":[[1]]},{"name":"cart-q","directions":1,"delays":[[1]]},{"name":"cart-rd","directions":1,"delays":[[1]]},{"name":"cart-s","directions":1,"delays":[[1]]},{"name":"cart-tear","directions":1,"delays":[[1]]},{"name":"cart-tox","directions":1,"delays":[[1]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cart" + }, + { + "name": "cart-a" + }, + { + "name": "cart-b" + }, + { + "name": "cart-c" + }, + { + "name": "cart-ce" + }, + { + "name": "cart-chem" + }, + { + "name": "cart-clown" + }, + { + "name": "cart-cmo" + }, + { + "name": "cart-e" + }, + { + "name": "cart-eye" + }, + { + "name": "cart-h" + }, + { + "name": "cart-hos" + }, + { + "name": "cart-j" + }, + { + "name": "cart-lib" + }, + { + "name": "cart-m" + }, + { + "name": "cart-mi" + }, + { + "name": "cart-q" + }, + { + "name": "cart-rd" + }, + { + "name": "cart-s" + }, + { + "name": "cart-tear" + }, + { + "name": "cart-tox" + } + ] +} diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index 944f937862..e9012ab3c6 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6", "states": [ { "name": "beacon", @@ -30,6 +30,9 @@ "name": "signaller-inhand-left", "directions": 4 }, + { + "name": "radio" + }, { "name": "walkietalkie" }, diff --git a/Resources/Textures/Objects/Devices/radio.png b/Resources/Textures/Objects/Devices/communication.rsi/radio.png similarity index 100% rename from Resources/Textures/Objects/Devices/radio.png rename to Resources/Textures/Objects/Devices/communication.rsi/radio.png diff --git a/Resources/Textures/Objects/Devices/pai.rsi/meta.json b/Resources/Textures/Objects/Devices/pai.rsi/meta.json deleted file mode 100644 index 0d57f83302..0000000000 --- a/Resources/Textures/Objects/Devices/pai.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"pai","directions":1,"delays":[[1]]},{"name":"pai-angry","directions":1,"delays":[[0.1,0.1,0.1,0.1]]},{"name":"pai-cat","directions":1,"delays":[[1,0.1,0.1,10]]},{"name":"pai-exclamation","directions":1,"delays":[[1,0.5,1,0.5]]},{"name":"pai-extremely-happy","directions":1,"delays":[[1,0.1,5]]},{"name":"pai-face","directions":1,"delays":[[5,0.1,0.1,10]]},{"name":"pai-happy","directions":1,"delays":[[1,0.1,0.1,10]]},{"name":"pai-laugh","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"pai-neutral","directions":1,"delays":[[5,0.1,0.1,0.1,4,0.1]]},{"name":"pai-nose","directions":1,"delays":[[1]]},{"name":"pai-off","directions":1,"delays":[[1]]},{"name":"pai-question","directions":1,"delays":[[1,0.5,1,0.5]]},{"name":"pai-sad","directions":1,"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]]},{"name":"pai-silly","directions":1,"delays":[[5,0.1,0.1,0.1,0.1,0.1,0.5,0.1]]},{"name":"pai-smirk","directions":1,"delays":[[2,0.5,0.5,0.5,0.5,0.5,0.5,5]]},{"name":"pai-what","directions":1,"delays":[[2,0.1,0.1,5]]}]} diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-angry.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-angry.png deleted file mode 100644 index 6d3f5d0115..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-angry.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-cat.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-cat.png deleted file mode 100644 index a25e96f19d..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-cat.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-exclamation.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-exclamation.png deleted file mode 100644 index 52a088b311..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-exclamation.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-extremely-happy.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-extremely-happy.png deleted file mode 100644 index 321b46c412..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-extremely-happy.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-face.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-face.png deleted file mode 100644 index 523077242f..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-face.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-happy.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-happy.png deleted file mode 100644 index eff72f0d91..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-happy.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-laugh.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-laugh.png deleted file mode 100644 index 7f70903253..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-laugh.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-neutral.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-neutral.png deleted file mode 100644 index 3049248fd6..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-neutral.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-nose.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-nose.png deleted file mode 100644 index 7325e5afa1..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-nose.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-off.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-off.png deleted file mode 100644 index 7f3a7ec1a6..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-off.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-question.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-question.png deleted file mode 100644 index 32d1bf2aeb..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-question.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-sad.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-sad.png deleted file mode 100644 index 1f040034b1..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-sad.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-silly.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-silly.png deleted file mode 100644 index cf0279e88c..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-silly.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-smirk.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-smirk.png deleted file mode 100644 index a6efa390da..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-smirk.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai-what.png b/Resources/Textures/Objects/Devices/pai.rsi/pai-what.png deleted file mode 100644 index d306828f7c..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai-what.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pai.rsi/pai.png b/Resources/Textures/Objects/Devices/pai.rsi/pai.png deleted file mode 100644 index 78845a991a..0000000000 Binary files a/Resources/Textures/Objects/Devices/pai.rsi/pai.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 2307e38944..0762084d11 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA 3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d", "states": [ { "name": "id_overlay" diff --git a/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json b/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json index e4a14ae96d..09d18d5852 100644 --- a/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/bikehorn.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Fun/caps.rsi/meta.json b/Resources/Textures/Objects/Fun/caps.rsi/meta.json index 147ceca10f..7c3eeeda10 100644 --- a/Resources/Textures/Objects/Fun/caps.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/caps.rsi/meta.json @@ -1,35 +1,35 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/aed9cbddbf9039dae1e4f02bab592248b0539431", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json index 456cb7644f..464c1ef137 100644 --- a/Resources/Textures/Objects/Fun/crayons.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/crayons.rsi/meta.json @@ -8,58 +8,58 @@ }, "states": [ { - "name": "black" + "name": "black" }, { - "name": "blue" + "name": "blue" }, { - "name": "box" + "name": "box" }, { - "name": "green" + "name": "green" }, { - "name": "mime" + "name": "mime" }, { - "name": "orange" + "name": "orange" }, { - "name": "purple" + "name": "purple" }, { - "name": "rainbow" + "name": "rainbow" }, { - "name": "red" + "name": "red" }, { - "name": "white" + "name": "white" }, { - "name": "yellow" + "name": "yellow" }, { - "name": "green_box" + "name": "green_box" }, { - "name": "orange_box" + "name": "orange_box" }, { - "name": "purple_box" + "name": "purple_box" }, { - "name": "red_box" + "name": "red_box" }, { - "name": "yellow_box" + "name": "yellow_box" }, { - "name": "black_box" + "name": "black_box" }, { - "name": "blue_box" + "name": "blue_box" } ] } diff --git a/Resources/Textures/Objects/Fun/dice.rsi/meta.json b/Resources/Textures/Objects/Fun/dice.rsi/meta.json index 7b23c3e5f6..7b75678573 100644 --- a/Resources/Textures/Objects/Fun/dice.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/dice.rsi/meta.json @@ -1 +1,227 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "d10010", "delays": [[1.0]]}, {"name": "d100100", "delays": [[1.0]]}, {"name": "d10020", "delays": [[1.0]]}, {"name": "d10030", "delays": [[1.0]]}, {"name": "d10040", "delays": [[1.0]]}, {"name": "d10050", "delays": [[1.0]]}, {"name": "d10060", "delays": [[1.0]]}, {"name": "d10070", "delays": [[1.0]]}, {"name": "d10080", "delays": [[1.0]]}, {"name": "d10090", "delays": [[1.0]]}, {"name": "d101", "delays": [[1.0]]}, {"name": "d1010", "delays": [[1.0]]}, {"name": "d102", "delays": [[1.0]]}, {"name": "d103", "delays": [[1.0]]}, {"name": "d104", "delays": [[1.0]]}, {"name": "d105", "delays": [[1.0]]}, {"name": "d106", "delays": [[1.0]]}, {"name": "d107", "delays": [[1.0]]}, {"name": "d108", "delays": [[1.0]]}, {"name": "d109", "delays": [[1.0]]}, {"name": "d121", "delays": [[1.0]]}, {"name": "d1210", "delays": [[1.0]]}, {"name": "d1211", "delays": [[1.0]]}, {"name": "d1212", "delays": [[1.0]]}, {"name": "d122", "delays": [[1.0]]}, {"name": "d123", "delays": [[1.0]]}, {"name": "d124", "delays": [[1.0]]}, {"name": "d125", "delays": [[1.0]]}, {"name": "d126", "delays": [[1.0]]}, {"name": "d127", "delays": [[1.0]]}, {"name": "d128", "delays": [[1.0]]}, {"name": "d129", "delays": [[1.0]]}, {"name": "d201", "delays": [[1.0]]}, {"name": "d2010", "delays": [[1.0]]}, {"name": "d2011", "delays": [[1.0]]}, {"name": "d2012", "delays": [[1.0]]}, {"name": "d2013", "delays": [[1.0]]}, {"name": "d2014", "delays": [[1.0]]}, {"name": "d2015", "delays": [[1.0]]}, {"name": "d2016", "delays": [[1.0]]}, {"name": "d2017", "delays": [[1.0]]}, {"name": "d2018", "delays": [[1.0]]}, {"name": "d2019", "delays": [[1.0]]}, {"name": "d202", "delays": [[1.0]]}, {"name": "d2020", "delays": [[1.0]]}, {"name": "d203", "delays": [[1.0]]}, {"name": "d204", "delays": [[1.0]]}, {"name": "d205", "delays": [[1.0]]}, {"name": "d206", "delays": [[1.0]]}, {"name": "d207", "delays": [[1.0]]}, {"name": "d208", "delays": [[1.0]]}, {"name": "d209", "delays": [[1.0]]}, {"name": "d41", "delays": [[1.0]]}, {"name": "d42", "delays": [[1.0]]}, {"name": "d43", "delays": [[1.0]]}, {"name": "d44", "delays": [[1.0]]}, {"name": "d61", "delays": [[1.0]]}, {"name": "d62", "delays": [[1.0]]}, {"name": "d63", "delays": [[1.0]]}, {"name": "d64", "delays": [[1.0]]}, {"name": "d65", "delays": [[1.0]]}, {"name": "d66", "delays": [[1.0]]}, {"name": "d81", "delays": [[1.0]]}, {"name": "d82", "delays": [[1.0]]}, {"name": "d83", "delays": [[1.0]]}, {"name": "d84", "delays": [[1.0]]}, {"name": "d85", "delays": [[1.0]]}, {"name": "d86", "delays": [[1.0]]}, {"name": "d87", "delays": [[1.0]]}, {"name": "d88", "delays": [[1.0]]}, {"name": "dicebag", "delays": [[1.0]]}, {"name": "magicdicebag", "delays": [[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "d10010" + }, + { + "name": "d100100" + }, + { + "name": "d10020" + }, + { + "name": "d10030" + }, + { + "name": "d10040" + }, + { + "name": "d10050" + }, + { + "name": "d10060" + }, + { + "name": "d10070" + }, + { + "name": "d10080" + }, + { + "name": "d10090" + }, + { + "name": "d101" + }, + { + "name": "d1010" + }, + { + "name": "d102" + }, + { + "name": "d103" + }, + { + "name": "d104" + }, + { + "name": "d105" + }, + { + "name": "d106" + }, + { + "name": "d107" + }, + { + "name": "d108" + }, + { + "name": "d109" + }, + { + "name": "d121" + }, + { + "name": "d1210" + }, + { + "name": "d1211" + }, + { + "name": "d1212" + }, + { + "name": "d122" + }, + { + "name": "d123" + }, + { + "name": "d124" + }, + { + "name": "d125" + }, + { + "name": "d126" + }, + { + "name": "d127" + }, + { + "name": "d128" + }, + { + "name": "d129" + }, + { + "name": "d201" + }, + { + "name": "d2010" + }, + { + "name": "d2011" + }, + { + "name": "d2012" + }, + { + "name": "d2013" + }, + { + "name": "d2014" + }, + { + "name": "d2015" + }, + { + "name": "d2016" + }, + { + "name": "d2017" + }, + { + "name": "d2018" + }, + { + "name": "d2019" + }, + { + "name": "d202" + }, + { + "name": "d2020" + }, + { + "name": "d203" + }, + { + "name": "d204" + }, + { + "name": "d205" + }, + { + "name": "d206" + }, + { + "name": "d207" + }, + { + "name": "d208" + }, + { + "name": "d209" + }, + { + "name": "d41" + }, + { + "name": "d42" + }, + { + "name": "d43" + }, + { + "name": "d44" + }, + { + "name": "d61" + }, + { + "name": "d62" + }, + { + "name": "d63" + }, + { + "name": "d64" + }, + { + "name": "d65" + }, + { + "name": "d66" + }, + { + "name": "d81" + }, + { + "name": "d82" + }, + { + "name": "d83" + }, + { + "name": "d84" + }, + { + "name": "d85" + }, + { + "name": "d86" + }, + { + "name": "d87" + }, + { + "name": "d88" + }, + { + "name": "dicebag" + }, + { + "name": "magicdicebag" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json index 81590bb254..e6b752420d 100644 --- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json @@ -8,52 +8,52 @@ }, "states": [ { - "name": "death" + "name": "death" }, { - "name": "death2" + "name": "death2" }, { - "name": "death2_cap" + "name": "death2_cap" }, { - "name": "death_cap" + "name": "death_cap" }, { - "name": "mime" + "name": "mime" }, { - "name": "mime2" + "name": "mime2" }, { - "name": "mime2_cap" + "name": "mime2_cap" }, { - "name": "mime_cap" + "name": "mime_cap" }, { - "name": "rainbow" + "name": "rainbow" }, { - "name": "rainbow2" + "name": "rainbow2" }, { - "name": "rainbow2_cap" + "name": "rainbow2_cap" }, { - "name": "rainbow_cap" + "name": "rainbow_cap" }, { - "name": "spray" + "name": "spray" }, { - "name": "spray_cap" + "name": "spray_cap" }, { - "name": "spray_cap_colors" + "name": "spray_cap_colors" }, { - "name": "spray_colors" + "name": "spray_colors" } ] } diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 140656e79e..4e62f6aff8 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 }, - "license": "CCBYSA3", - "copyright": "https://github.com/tgstation/tgstation", "states": [ { "name": "carpplush" @@ -147,7 +147,7 @@ "directions": 4 }, { - "name": "capgun-inhand-right", + "name": "capgun-inhand-left", "directions": 4 }, { @@ -262,21 +262,20 @@ ] ] }, - { - "name": "singularitytoy", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + { + "name": "singularitytoy", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Materials/Shards/piece.rsi/meta.json b/Resources/Textures/Objects/Materials/Shards/piece.rsi/meta.json index fa4f51f793..8423a17bd7 100644 --- a/Resources/Textures/Objects/Materials/Shards/piece.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Shards/piece.rsi/meta.json @@ -1,23 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "piecelarge", }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e", - "states": [ - { - "name": "piecelarge", - - }, - { - "name": "piecemedium", - - }, - { - "name": "piecesmall", - - } - ] -} \ No newline at end of file + { + "name": "piecemedium", + }, + { + "name": "piecesmall", + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Shards/shard.rsi/meta.json b/Resources/Textures/Objects/Materials/Shards/shard.rsi/meta.json index 14dd39427c..7a5849b7c5 100644 --- a/Resources/Textures/Objects/Materials/Shards/shard.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Shards/shard.rsi/meta.json @@ -1,31 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e", - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "shard3", - - }, - { - "name": "shard2", - - }, - { - "name": "shard1", - - } - ] + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "shard3", + }, + { + "name": "shard2", + }, + { + "name": "shard1", + } + ] } diff --git a/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/meta.json b/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/meta.json index 2517b87f9c..03cb986d25 100644 --- a/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/meta.json @@ -1,23 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shrapnellarge", }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e", - "states": [ - { - "name": "shrapnellarge", - - }, - { - "name": "shrapnelmedium", - - }, - { - "name": "shrapnelsmall", - - } - ] -} \ No newline at end of file + { + "name": "shrapnelmedium", + }, + { + "name": "shrapnelsmall", + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Shards/splinters.rsi/meta.json b/Resources/Textures/Objects/Materials/Shards/splinters.rsi/meta.json index 1dbe1b6279..3cea1504f2 100644 --- a/Resources/Textures/Objects/Materials/Shards/splinters.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Shards/splinters.rsi/meta.json @@ -1,23 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "splinterslarge", }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e", - "states": [ - { - "name": "splinterslarge", - - }, - { - "name": "splintersmedium", - - }, - { - "name": "splinterssmall", - - } - ] -} \ No newline at end of file + { + "name": "splintersmedium", + }, + { + "name": "splinterssmall", + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json index 84cb316cef..80490cc893 100644 --- a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json @@ -8,102 +8,102 @@ }, "states": [ { - "name": "glass" + "name": "glass" }, { - "name": "glass_2" + "name": "glass_2" }, { - "name": "glass_3" + "name": "glass_3" }, { - "name": "glass-inhand-left", - "directions": 4 + "name": "glass-inhand-left", + "directions": 4 }, { - "name": "pglass" + "name": "pglass" }, { - "name": "pglass_2" + "name": "pglass_2" }, { - "name": "pglass_3" + "name": "pglass_3" }, { - "name": "pglass-inhand-left", - "directions": 4 + "name": "pglass-inhand-left", + "directions": 4 }, { - "name": "pglass-inhand-right", - "directions": 4 + "name": "pglass-inhand-right", + "directions": 4 }, { - "name": "plastitaniumglass" + "name": "plastitaniumglass" }, { - "name": "plastitaniumglass_2" + "name": "plastitaniumglass_2" }, { - "name": "plastitaniumglass_3" + "name": "plastitaniumglass_3" }, { - "name": "plastitaniumglass-inhand-left", - "directions": 4 + "name": "plastitaniumglass-inhand-left", + "directions": 4 }, { - "name": "plastitaniumglass-inhand-right", - "directions": 4 + "name": "plastitaniumglass-inhand-right", + "directions": 4 }, { - "name": "rpglass" + "name": "rpglass" }, { - "name": "rpglass_2" + "name": "rpglass_2" }, { - "name": "rpglass_3" + "name": "rpglass_3" }, { - "name": "rpglass-inhand-left", - "directions": 4 + "name": "rpglass-inhand-left", + "directions": 4 }, { - "name": "rpglass-inhand-right", - "directions": 4 + "name": "rpglass-inhand-right", + "directions": 4 }, { - "name": "rglass" + "name": "rglass" }, { - "name": "rglass_2" + "name": "rglass_2" }, { - "name": "rglass_3" + "name": "rglass_3" }, { - "name": "rglass-inhand-left", - "directions": 4 + "name": "rglass-inhand-left", + "directions": 4 }, { - "name": "rglass-inhand-right", - "directions": 4 + "name": "rglass-inhand-right", + "directions": 4 }, { - "name": "titaniumglass" + "name": "titaniumglass" }, { - "name": "titaniumglass_2" + "name": "titaniumglass_2" }, { - "name": "titaniumglass_3" + "name": "titaniumglass_3" }, { - "name": "titaniumglass-inhand-left", - "directions": 4 + "name": "titaniumglass-inhand-left", + "directions": 4 }, { - "name": "titaniumglass-inhand-right", - "directions": 4 + "name": "titaniumglass-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json index 40a70704aa..920eb63731 100644 --- a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/meta.json @@ -8,89 +8,89 @@ }, "states": [ { - "name": "brass" + "name": "brass" }, { - "name": "brass_2" + "name": "brass_2" }, { - "name": "brass_3" + "name": "brass_3" }, { - "name": "brass-inhand-left", - "directions": 4 + "name": "brass-inhand-left", + "directions": 4 }, { - "name": "brass-inhand-right", - "directions": 4 + "name": "brass-inhand-right", + "directions": 4 }, { - "name": "plasteel" + "name": "plasteel" }, { - "name": "plasteel_2" + "name": "plasteel_2" }, { - "name": "plasteel_3" + "name": "plasteel_3" }, { - "name": "plasteel-inhand-left", - "directions": 4 + "name": "plasteel-inhand-left", + "directions": 4 }, { - "name": "plasteel-inhand-right", - "directions": 4 + "name": "plasteel-inhand-right", + "directions": 4 }, { - "name": "plastitanium" + "name": "plastitanium" }, { - "name": "plastitanium_2" + "name": "plastitanium_2" }, { - "name": "plastitanium_3" + "name": "plastitanium_3" }, { - "name": "plastitanium-inhand-left", - "directions": 4 + "name": "plastitanium-inhand-left", + "directions": 4 }, { - "name": "plastitanium-inhand-right", - "directions": 4 + "name": "plastitanium-inhand-right", + "directions": 4 }, { - "name": "steel" + "name": "steel" }, { - "name": "steel_2" + "name": "steel_2" }, { - "name": "steel_3" + "name": "steel_3" }, { - "name": "steel-inhand-left", - "directions": 4 + "name": "steel-inhand-left", + "directions": 4 }, { - "name": "steel-inhand-right", - "directions": 4 + "name": "steel-inhand-right", + "directions": 4 }, { - "name": "titanium" + "name": "titanium" }, { - "name": "titanium_2" + "name": "titanium_2" }, { - "name": "titanium_3" + "name": "titanium_3" }, { - "name": "titanium-inhand-left", - "directions": 4 + "name": "titanium-inhand-left", + "directions": 4 }, { - "name": "titanium-inhand-right", - "directions": 4 + "name": "titanium-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json index 7b17efcd45..5b7b81e975 100644 --- a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json @@ -8,77 +8,77 @@ }, "states": [ { - "name": "phoron" + "name": "phoron" }, { - "name": "phoron-inhand-left", - "directions": 4 + "name": "phoron-inhand-left", + "directions": 4 }, { - "name": "phoron-inhand-right", - "directions": 4 + "name": "phoron-inhand-right", + "directions": 4 }, { - "name": "paper" + "name": "paper" }, { - "name": "paper_2" + "name": "paper_2" }, { - "name": "paper_3" + "name": "paper_3" }, { - "name": "paper-inhand-left", - "directions": 4 + "name": "paper-inhand-left", + "directions": 4 }, { - "name": "paper-inhand-right", - "directions": 4 + "name": "paper-inhand-right", + "directions": 4 }, { - "name": "plastic" + "name": "plastic" }, { - "name": "plastic_2" + "name": "plastic_2" }, { - "name": "plastic_3" + "name": "plastic_3" }, { - "name": "plastic-inhand-left", - "directions": 4 + "name": "plastic-inhand-left", + "directions": 4 }, { - "name": "plastic-inhand-right", - "directions": 4 + "name": "plastic-inhand-right", + "directions": 4 }, { - "name": "plasma" + "name": "plasma" }, { - "name": "plasma_2" + "name": "plasma_2" }, { - "name": "plasma_3" + "name": "plasma_3" }, { - "name": "plasma-inhand-left", - "directions": 4 + "name": "plasma-inhand-left", + "directions": 4 }, { - "name": "plasma-inhand-right", - "directions": 4 + "name": "plasma-inhand-right", + "directions": 4 }, { - "name": "uranium" + "name": "uranium" }, { - "name": "uranium-inhand-left", - "directions": 4 + "name": "uranium-inhand-left", + "directions": 4 }, { - "name": "uranium-inhand-right", - "directions": 4 + "name": "uranium-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/meta.json b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json index 10997202ef..05b9647ea1 100644 --- a/Resources/Textures/Objects/Materials/ingots.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/ingots.rsi/meta.json @@ -8,115 +8,115 @@ }, "states": [ { - "name": "adamantine" + "name": "adamantine" }, { - "name": "adamantine_2" + "name": "adamantine_2" }, { - "name": "adamantine_3" + "name": "adamantine_3" }, { - "name": "adamantine-inhand-left", - "directions": 4 + "name": "adamantine-inhand-left", + "directions": 4 }, { - "name": "adamantine-inhand-right", - "directions": 4 + "name": "adamantine-inhand-right", + "directions": 4 }, { - "name": "alpha" + "name": "alpha" }, { - "name": "alpha_2" + "name": "alpha_2" }, { - "name": "alpha_3" + "name": "alpha_3" }, { - "name": "copper" + "name": "copper" }, { - "name": "copper_2" + "name": "copper_2" }, { - "name": "copper_3" + "name": "copper_3" }, { - "name": "copper-inhand-left", - "directions": 4 + "name": "copper-inhand-left", + "directions": 4 }, { - "name": "copper-inhand-right", - "directions": 4 + "name": "copper-inhand-right", + "directions": 4 }, { - "name": "gold" + "name": "gold" }, { - "name": "gold_2" + "name": "gold_2" }, { - "name": "gold_3" + "name": "gold_3" }, { - "name": "gold-inhand-left", - "directions": 4 + "name": "gold-inhand-left", + "directions": 4 }, { - "name": "gold-inhand-right", - "directions": 4 + "name": "gold-inhand-right", + "directions": 4 }, { - "name": "hydrogen" + "name": "hydrogen" }, { - "name": "hydrogen_2" + "name": "hydrogen_2" }, { - "name": "hydrogen_3" + "name": "hydrogen_3" }, { - "name": "hydrogen-inhand-left", - "directions": 4 + "name": "hydrogen-inhand-left", + "directions": 4 }, { - "name": "hydrogen-inhand-right", - "directions": 4 + "name": "hydrogen-inhand-right", + "directions": 4 }, { - "name": "iron" + "name": "iron" }, { - "name": "iron_2" + "name": "iron_2" }, { - "name": "iron_3" + "name": "iron_3" }, { - "name": "iron-inhand-left", - "directions": 4 + "name": "iron-inhand-left", + "directions": 4 }, { - "name": "iron-inhand-right", - "directions": 4 + "name": "iron-inhand-right", + "directions": 4 }, { - "name": "silver" + "name": "silver" }, { - "name": "silver_2" + "name": "silver_2" }, { - "name": "silver_3" + "name": "silver_3" }, { - "name": "silver-inhand-left", - "directions": 4 + "name": "silver-inhand-left", + "directions": 4 }, { - "name": "silver-inhand-right", - "directions": 4 + "name": "silver-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index 47b129849a..d4ad379ee8 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json @@ -8,107 +8,107 @@ }, "states": [ { - "name": "alienhide" + "name": "alienhide" }, { - "name": "bananium" + "name": "bananium" }, { - "name": "bearpelt" + "name": "bearpelt" }, { - "name": "cathide" + "name": "cathide" }, { - "name": "cloth" + "name": "cloth" }, { - "name": "cloth_2" + "name": "cloth_2" }, { - "name": "cloth_3" + "name": "cloth_3" }, { - "name": "corgihide" + "name": "corgihide" }, { - "name": "cotton" + "name": "cotton" }, { - "name": "cotton_2" + "name": "cotton_2" }, { - "name": "cotton_3" + "name": "cotton_3" }, { - "name": "diamond" + "name": "diamond" }, { - "name": "diamond-inhand-left", - "directions": 4 + "name": "diamond-inhand-left", + "directions": 4 }, { - "name": "diamond-inhand-right", - "directions": 4 + "name": "diamond-inhand-right", + "directions": 4 }, { - "name": "durathread" + "name": "durathread" }, { - "name": "durathread_2" + "name": "durathread_2" }, { - "name": "durathread_3" + "name": "durathread_3" }, { - "name": "durathreadraw" + "name": "durathreadraw" }, { - "name": "durathreadraw_2" + "name": "durathreadraw_2" }, { - "name": "durathreadraw_3" + "name": "durathreadraw_3" }, { - "name": "hide" + "name": "hide" }, { - "name": "hide_2" + "name": "hide_2" }, { - "name": "hide_3" + "name": "hide_3" }, { - "name": "leather" + "name": "leather" }, { - "name": "leather_2" + "name": "leather_2" }, { - "name": "leather_3" + "name": "leather_3" }, { - "name": "liggerhide" + "name": "liggerhide" }, { - "name": "monkeyhide" + "name": "monkeyhide" }, { - "name": "phoron_gem" + "name": "phoron_gem" }, { - "name": "phoron_gem_spent" + "name": "phoron_gem_spent" }, { - "name": "wood" + "name": "wood" }, { - "name": "wood-inhand-left", - "directions": 4 + "name": "wood-inhand-left", + "directions": 4 }, { - "name": "wood-inhand-right", - "directions": 4 + "name": "wood-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Misc/bluelighterlit.png b/Resources/Textures/Objects/Misc/bluelighterlit.png deleted file mode 100644 index 858dc6dbb2..0000000000 Binary files a/Resources/Textures/Objects/Misc/bluelighterlit.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/bluelighterunlit.png b/Resources/Textures/Objects/Misc/bluelighterunlit.png deleted file mode 100644 index 65162046ee..0000000000 Binary files a/Resources/Textures/Objects/Misc/bluelighterunlit.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index c1ebfc79f9..c0ce516165 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1 +1,301 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from LINKTOCODEBASE", "states": [{"name": "chestdrawer", "delays": [[1.0]]}, {"name": "chestdrawer-open", "delays": [[0.5, 0.1]]}, {"name": "clipboard", "delays": [[1.0]]}, {"name": "clipboard_over", "delays": [[1.0]]}, {"name": "clipboard_pen", "delays": [[1.0]]}, {"name": "envelope_closed", "delays": [[1.0]]}, {"name": "envelope_open", "delays": [[1.0]]}, {"name": "envelope_open_overlay", "delays": [[1.0]]}, {"name": "envelope_torn", "delays": [[1.0]]}, {"name": "envelope_torn_overlay", "delays": [[1.0]]}, {"name": "filingcabinet", "delays": [[1.0]]}, {"name": "filingcabinet-open", "delays": [[0.5, 0.1]]}, {"name": "folder", "delays": [[1.0]]}, {"name": "folder_blue", "delays": [[1.0]]}, {"name": "folder_paper", "delays": [[1.0]]}, {"name": "folder_red", "delays": [[1.0]]}, {"name": "folder_white", "delays": [[1.0]]}, {"name": "folder_yellow", "delays": [[1.0]]}, {"name": "label_cart", "delays": [[1.0]]}, {"name": "labeler0", "delays": [[1.0]]}, {"name": "labeler1", "delays": [[1.0]]}, {"name": "labeler_e", "delays": [[1.0]]}, {"name": "nano_paper", "delays": [[1.0]]}, {"name": "nano_paper_words", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "newspaper", "delays": [[1.0]]}, {"name": "np_dispenser", "delays": [[1.0]]}, {"name": "np_dispenser_empty", "delays": [[1.0]]}, {"name": "pamphlet", "delays": [[1.0]]}, {"name": "paper", "delays": [[1.0]]}, {"name": "paper_bin0", "delays": [[1.0]]}, {"name": "paper_bin1", "delays": [[1.0]]}, {"name": "paper_bin2", "delays": [[1.0]]}, {"name": "paper_bin3", "delays": [[1.0]]}, {"name": "paper_plane", "delays": [[1.0]]}, {"name": "paper_stamp-cap", "delays": [[1.0]]}, {"name": "paper_stamp-ce", "delays": [[1.0]]}, {"name": "paper_stamp-cent", "delays": [[1.0]]}, {"name": "paper_stamp-chaplain", "delays": [[1.0]]}, {"name": "paper_stamp-clown", "delays": [[1.0]]}, {"name": "paper_stamp-cmo", "delays": [[1.0]]}, {"name": "paper_stamp-deny", "delays": [[1.0]]}, {"name": "paper_stamp-hop", "delays": [[1.0]]}, {"name": "paper_stamp-hos", "delays": [[1.0]]}, {"name": "paper_stamp-iaa", "delays": [[1.0]]}, {"name": "paper_stamp-mime", "delays": [[1.0]]}, {"name": "paper_stamp-qm", "delays": [[1.0]]}, {"name": "paper_stamp-rd", "delays": [[1.0]]}, {"name": "paper_stamp-trader", "delays": [[1.0]]}, {"name": "paper_stamp-warden", "delays": [[1.0]]}, {"name": "paper_talisman", "delays": [[1.0]]}, {"name": "paper_talisman_armor", "delays": [[1.0]]}, {"name": "paper_talisman_blind", "delays": [[1.0]]}, {"name": "paper_talisman_communicate", "delays": [[1.0]]}, {"name": "paper_talisman_conceal", "delays": [[1.0]]}, {"name": "paper_talisman_deafen", "delays": [[1.0]]}, {"name": "paper_talisman_emp", "delays": [[1.0]]}, {"name": "paper_talisman_newtome", "delays": [[1.0]]}, {"name": "paper_talisman_revealrunes", "delays": [[1.0]]}, {"name": "paper_talisman_runestun", "delays": [[1.0]]}, {"name": "paper_talisman_supply", "delays": [[1.0]]}, {"name": "paper_talisman_travel", "delays": [[1.0]]}, {"name": "paper_talisman_travel_unused", "delays": [[1.0]]}, {"name": "paper_words", "delays": [[1.0]]}, {"name": "paper_words-blood", "delays": [[1.0]]}, {"name": "pen", "delays": [[1.0]]}, {"name": "pen_blue", "delays": [[1.0]]}, {"name": "pen_red", "delays": [[1.0]]}, {"name": "scrap", "delays": [[1.0]]}, {"name": "scrap_bloodied", "delays": [[1.0]]}, {"name": "stamp-cap", "delays": [[1.0]]}, {"name": "stamp-ce", "delays": [[1.0]]}, {"name": "stamp-cent", "delays": [[1.0]]}, {"name": "stamp-chaplain", "delays": [[1.0]]}, {"name": "stamp-clown", "delays": [[1.0]]}, {"name": "stamp-cmo", "delays": [[1.0]]}, {"name": "stamp-deny", "delays": [[1.0]]}, {"name": "stamp-hop", "delays": [[1.0]]}, {"name": "stamp-hos", "delays": [[1.0]]}, {"name": "stamp-iaa", "delays": [[1.0]]}, {"name": "stamp-mime", "delays": [[1.0]]}, {"name": "stamp-qm", "delays": [[1.0]]}, {"name": "stamp-rd", "delays": [[1.0]]}, {"name": "stamp-trader", "delays": [[1.0]]}, {"name": "stamp-warden", "delays": [[1.0]]}, {"name": "tallcabinet", "delays": [[1.0]]}, {"name": "tallcabinet-open", "delays": [[0.5, 0.1]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "chestdrawer" + }, + { + "name": "chestdrawer-open", + "delays": [ + [ + 0.5, + 0.1 + ] + ] + }, + { + "name": "clipboard" + }, + { + "name": "clipboard_over" + }, + { + "name": "clipboard_pen" + }, + { + "name": "envelope_closed" + }, + { + "name": "envelope_open" + }, + { + "name": "envelope_open_overlay" + }, + { + "name": "envelope_torn" + }, + { + "name": "envelope_torn_overlay" + }, + { + "name": "filingcabinet" + }, + { + "name": "filingcabinet-open", + "delays": [ + [ + 0.5, + 0.1 + ] + ] + }, + { + "name": "folder" + }, + { + "name": "folder_blue" + }, + { + "name": "folder_paper" + }, + { + "name": "folder_red" + }, + { + "name": "folder_white" + }, + { + "name": "folder_yellow" + }, + { + "name": "label_cart" + }, + { + "name": "labeler0" + }, + { + "name": "labeler1" + }, + { + "name": "labeler_e" + }, + { + "name": "nano_paper" + }, + { + "name": "nano_paper_words", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "newspaper" + }, + { + "name": "np_dispenser" + }, + { + "name": "np_dispenser_empty" + }, + { + "name": "pamphlet" + }, + { + "name": "paper" + }, + { + "name": "paper_bin0" + }, + { + "name": "paper_bin1" + }, + { + "name": "paper_bin2" + }, + { + "name": "paper_bin3" + }, + { + "name": "paper_plane" + }, + { + "name": "paper_stamp-cap" + }, + { + "name": "paper_stamp-ce" + }, + { + "name": "paper_stamp-cent" + }, + { + "name": "paper_stamp-chaplain" + }, + { + "name": "paper_stamp-clown" + }, + { + "name": "paper_stamp-cmo" + }, + { + "name": "paper_stamp-deny" + }, + { + "name": "paper_stamp-hop" + }, + { + "name": "paper_stamp-hos" + }, + { + "name": "paper_stamp-iaa" + }, + { + "name": "paper_stamp-mime" + }, + { + "name": "paper_stamp-qm" + }, + { + "name": "paper_stamp-rd" + }, + { + "name": "paper_stamp-trader" + }, + { + "name": "paper_stamp-warden" + }, + { + "name": "paper_talisman" + }, + { + "name": "paper_talisman_armor" + }, + { + "name": "paper_talisman_blind" + }, + { + "name": "paper_talisman_communicate" + }, + { + "name": "paper_talisman_conceal" + }, + { + "name": "paper_talisman_deafen" + }, + { + "name": "paper_talisman_emp" + }, + { + "name": "paper_talisman_newtome" + }, + { + "name": "paper_talisman_revealrunes" + }, + { + "name": "paper_talisman_runestun" + }, + { + "name": "paper_talisman_supply" + }, + { + "name": "paper_talisman_travel" + }, + { + "name": "paper_talisman_travel_unused" + }, + { + "name": "paper_words" + }, + { + "name": "paper_words-blood" + }, + { + "name": "pen" + }, + { + "name": "pen_blue" + }, + { + "name": "pen_red" + }, + { + "name": "scrap" + }, + { + "name": "scrap_bloodied" + }, + { + "name": "stamp-cap" + }, + { + "name": "stamp-ce" + }, + { + "name": "stamp-cent" + }, + { + "name": "stamp-chaplain" + }, + { + "name": "stamp-clown" + }, + { + "name": "stamp-cmo" + }, + { + "name": "stamp-deny" + }, + { + "name": "stamp-hop" + }, + { + "name": "stamp-hos" + }, + { + "name": "stamp-iaa" + }, + { + "name": "stamp-mime" + }, + { + "name": "stamp-qm" + }, + { + "name": "stamp-rd" + }, + { + "name": "stamp-trader" + }, + { + "name": "stamp-warden" + }, + { + "name": "tallcabinet" + }, + { + "name": "tallcabinet-open", + "delays": [ + [ + 0.5, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Misc/cablecuffs.rsi/meta.json b/Resources/Textures/Objects/Misc/cablecuffs.rsi/meta.json index 62acbf0edb..e2df79963f 100644 --- a/Resources/Textures/Objects/Misc/cablecuffs.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/cablecuffs.rsi/meta.json @@ -1,5 +1,7 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 @@ -8,14 +10,14 @@ { "name": "cuff" }, - { + { "name": "cuff-broken" }, - { + { "name": "body-overlay-2", "directions": 4 }, - { + { "name": "body-overlay-4", "directions": 4 }, diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/meta.json b/Resources/Textures/Objects/Misc/carvings.rsi/meta.json index b69bfe0f8f..1ca8c6420b 100644 --- a/Resources/Textures/Objects/Misc/carvings.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/carvings.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@Bright#2366", "size": { "x": 32, "y": 32 }, - "license": "", - "copyright": "By Bright", "states": [ { "name": "hello" diff --git a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json index 44b4b85ea7..be587fee3a 100644 --- a/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/fire_extinguisher.rsi/meta.json @@ -1,27 +1,25 @@ { - "version": 1, - "license": "CC BY-SA 3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC BY-SA 3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "fire_extinguisher_open", }, - "states": [ - { - "name": "fire_extinguisher_open", - - }, - { - "name": "fire_extinguisher_closed", - - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - } - ] + { + "name": "fire_extinguisher_closed", + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Misc/glowstick.rsi/meta.json b/Resources/Textures/Objects/Misc/glowstick.rsi/meta.json index bc1a763bbc..decdb6606f 100644 --- a/Resources/Textures/Objects/Misc/glowstick.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/glowstick.rsi/meta.json @@ -1,45 +1,39 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites created by https://github.com/nuke-makes-games", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "off-inhand-left", + "directions": 4 }, - "license": "CC-BY-SA-3.0", - "copyright": "Sprites created by https://github.com/nuke-makes-games", - "states": - [ - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 - }, - { - "name": "glowstick_base", - - }, - { - "name": "glowstick_lit", - - }, - { - "name": "glowstick_glow", - - }, - { - "name": "glowstick_unlit", - - } - ] + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + }, + { + "name": "glowstick_base", + }, + { + "name": "glowstick_lit", + }, + { + "name": "glowstick_glow", + }, + { + "name": "glowstick_unlit", + } + ] } - diff --git a/Resources/Textures/Objects/Misc/hand_tele.rsi/charging.png b/Resources/Textures/Objects/Misc/hand_tele.rsi/charging.png deleted file mode 100644 index 64fefef232..0000000000 Binary files a/Resources/Textures/Objects/Misc/hand_tele.rsi/charging.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/hand_tele.rsi/meta.json b/Resources/Textures/Objects/Misc/hand_tele.rsi/meta.json deleted file mode 100644 index 8c79ac2a59..0000000000 --- a/Resources/Textures/Objects/Misc/hand_tele.rsi/meta.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/device.dmi", - "states": [ - { - "name": "charging", - "delays": [ - [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - ] - }, - { - "name": "ready", - "delays": [ - [ - 5.0, - 5.0 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/hand_tele.rsi/ready.png b/Resources/Textures/Objects/Misc/hand_tele.rsi/ready.png deleted file mode 100644 index b810596d41..0000000000 Binary files a/Resources/Textures/Objects/Misc/hand_tele.rsi/ready.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/handcuffs.rsi/meta.json b/Resources/Textures/Objects/Misc/handcuffs.rsi/meta.json index d471cf94d9..80a19e8560 100644 --- a/Resources/Textures/Objects/Misc/handcuffs.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/handcuffs.rsi/meta.json @@ -1,8 +1,34 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [ -{"name": "body-overlay-2", "directions": 4}, -{"name": "body-overlay-4", "directions": 4}, -{"name": "handcuff"}, -{"name": "inhand-left", "directions": 4}, -{"name": "inhand-right", "directions": 4}, -{"name": "equipped-BELT", "directions": 4} -]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "handcuff" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "body-overlay-2", + "directions": 4 + }, + { + "name": "body-overlay-4", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index e4e35b6ec9..c71b490ce7 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -175,7 +175,7 @@ "directions": 4 }, { - "name": "default-inhand-right", + "name": "default-inhand-left", "directions": 4 }, { diff --git a/Resources/Textures/Objects/Misc/inflatable_wall.rsi/meta.json b/Resources/Textures/Objects/Misc/inflatable_wall.rsi/meta.json index f10663bb58..ff8e81279c 100644 --- a/Resources/Textures/Objects/Misc/inflatable_wall.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/inflatable_wall.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "inflatable_wall taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/obj/inflatable.dmi and modified. item_wall by ShadowCommander.", + "copyright": "Taken from cev-eris and modified by ShadowCommander at https://github.com/discordia-space/CEV-Eris/commit/c34c1b30abf18aa552e19294523924c39e5ea127 | item_wall by ShadowCommander", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Misc/lights.rsi/meta.json b/Resources/Textures/Objects/Misc/lights.rsi/meta.json index 6378a34e3d..26781ab06d 100644 --- a/Resources/Textures/Objects/Misc/lights.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/lights.rsi/meta.json @@ -1,5 +1,7 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerbronze-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerbronze-on.png deleted file mode 100644 index 823e5fc2ff..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerbronze-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerbronze.png b/Resources/Textures/Objects/Misc/markers.rsi/markerbronze.png deleted file mode 100644 index f6dbcc26a1..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerbronze.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy-on.png deleted file mode 100644 index f3ade0c23d..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy.png b/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy.png deleted file mode 100644 index 88839df85e..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerburgundy.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markercerulean-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markercerulean-on.png deleted file mode 100644 index fb34f6d548..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markercerulean-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markercerulean.png b/Resources/Textures/Objects/Misc/markers.rsi/markercerulean.png deleted file mode 100644 index 43cd9c5076..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markercerulean.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia-on.png deleted file mode 100644 index b33ee445d9..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia.png b/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia.png deleted file mode 100644 index 87f7d646ba..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerfuchsia.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerindigo-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerindigo-on.png deleted file mode 100644 index 753a520fb2..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerindigo-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerindigo.png b/Resources/Textures/Objects/Misc/markers.rsi/markerindigo.png deleted file mode 100644 index c4608e83b9..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerindigo.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerjade-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerjade-on.png deleted file mode 100644 index 00eced565b..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerjade-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerjade.png b/Resources/Textures/Objects/Misc/markers.rsi/markerjade.png deleted file mode 100644 index 7c2c6a4694..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerjade.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerlime-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerlime-on.png deleted file mode 100644 index 1e2219aa95..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerlime-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerlime.png b/Resources/Textures/Objects/Misc/markers.rsi/markerlime.png deleted file mode 100644 index 72d924784e..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerlime.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerolive-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerolive-on.png deleted file mode 100644 index 311c890077..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerolive-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerolive.png b/Resources/Textures/Objects/Misc/markers.rsi/markerolive.png deleted file mode 100644 index 6d9f927061..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerolive.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerpurple-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerpurple-on.png deleted file mode 100644 index 941495519d..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerpurple-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerpurple.png b/Resources/Textures/Objects/Misc/markers.rsi/markerpurple.png deleted file mode 100644 index 22a043d551..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerpurple.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerrandom.png b/Resources/Textures/Objects/Misc/markers.rsi/markerrandom.png deleted file mode 100644 index d773558b39..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerrandom.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerteal-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerteal-on.png deleted file mode 100644 index 4c60059e52..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerteal-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerteal.png b/Resources/Textures/Objects/Misc/markers.rsi/markerteal.png deleted file mode 100644 index 1603665d5a..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerteal.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerviolet-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markerviolet-on.png deleted file mode 100644 index 39bab3f1f6..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerviolet-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markerviolet.png b/Resources/Textures/Objects/Misc/markers.rsi/markerviolet.png deleted file mode 100644 index 1a467d5f0e..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markerviolet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markeryellow-on.png b/Resources/Textures/Objects/Misc/markers.rsi/markeryellow-on.png deleted file mode 100644 index b173cc6f4e..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markeryellow-on.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/markeryellow.png b/Resources/Textures/Objects/Misc/markers.rsi/markeryellow.png deleted file mode 100644 index a465d88e4f..0000000000 Binary files a/Resources/Textures/Objects/Misc/markers.rsi/markeryellow.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/markers.rsi/meta.json b/Resources/Textures/Objects/Misc/markers.rsi/meta.json deleted file mode 100644 index 2b47f692c4..0000000000 --- a/Resources/Textures/Objects/Misc/markers.rsi/meta.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "markerbronze" - }, - { - "name": "markerbronze-on" - }, - { - "name": "markerburgundy" - }, - { - "name": "markerburgundy-on" - }, - { - "name": "markercerulean" - }, - { - "name": "markercerulean-on" - }, - { - "name": "markerfuchsia" - }, - { - "name": "markerfuchsia-on" - }, - { - "name": "markerindigo" - }, - { - "name": "markerindigo-on" - }, - { - "name": "markerjade" - }, - { - "name": "markerjade-on" - }, - { - "name": "markerlime" - }, - { - "name": "markerlime-on" - }, - { - "name": "markerolive" - }, - { - "name": "markerolive-on" - }, - { - "name": "markerpurple" - }, - { - "name": "markerpurple-on" - }, - { - "name": "markerrandom" - }, - { - "name": "markerteal" - }, - { - "name": "markerteal-on" - }, - { - "name": "markerviolet" - }, - { - "name": "markerviolet-on" - }, - { - "name": "markeryellow" - }, - { - "name": "markeryellow-on" - } - ] -} diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json index ddbeb7ced1..ed505f230c 100644 --- a/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a7215663648f4289d2446a1c82aec1c9a406310c", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a7215663648f4289d2446a1c82aec1c9a406310c", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Misc/skub.rsi/meta.json b/Resources/Textures/Objects/Misc/skub.rsi/meta.json index fb2bcc3dab..737bb98569 100644 --- a/Resources/Textures/Objects/Misc/skub.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/skub.rsi/meta.json @@ -1 +1,22 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation", "states": [{"name": "icon", "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Misc/torch.rsi/meta.json b/Resources/Textures/Objects/Misc/torch.rsi/meta.json index 693c9f26ff..3005640b83 100644 --- a/Resources/Textures/Objects/Misc/torch.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/torch.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0f6496a55ceefa0f1bf1668fcef49b5182471695", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0f6496a55ceefa0f1bf1668fcef49b5182471695", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Misc/traitordm.rsi/meta.json b/Resources/Textures/Objects/Misc/traitordm.rsi/meta.json index 49ec5fba6f..6f167e8f19 100644 --- a/Resources/Textures/Objects/Misc/traitordm.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/traitordm.rsi/meta.json @@ -1,10 +1,17 @@ { - "version":1, - "size":{"x":32,"y":32}, - "states":[ - {"name":"redemption","directions":1,"delays":[[1.0]]}, - {"name":"redemption-unshaded","directions":1,"delays":[[1.0]]} - ], - "license": "CC-BY-SA-3.0", - "copyright": "Edit by Tomeno using small parts of autolathe from https://github.com/tgstation/tgstation/blob/acb091f9744e9ab7d5a27fb32dd0c03bd019f58c/icons/obj/stationobjs.dmi (may be an earlier version) and tcboss from https://github.com/tgstation/tgstation/blob/e32357e6b0ec0f0a1821d2773f0d1e1d6ce7d494/icons/obj/computer.dmi (may be an earlier version)" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edit by Tomeno using small parts of autolathe from https://github.com/tgstation/tgstation/blob/acb091f9744e9ab7d5a27fb32dd0c03bd019f58c/icons/obj/stationobjs.dmi (may be an earlier version) and tcboss from https://github.com/tgstation/tgstation/blob/e32357e6b0ec0f0a1821d2773f0d1e1d6ce7d494/icons/obj/computer.dmi (may be an earlier version)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "redemption" + }, + { + "name": "redemption-unshaded" + } + ] } diff --git a/Resources/Textures/Objects/Misc/utensils.rsi/meta.json b/Resources/Textures/Objects/Misc/utensils.rsi/meta.json index f6692ed1e8..1e2ce7e9ca 100644 --- a/Resources/Textures/Objects/Misc/utensils.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/utensils.rsi/meta.json @@ -1 +1,29 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"spoon","directions":1,"delays":[[1.0]]},{"name":"fork","directions":1,"delays":[[1.0]]},{"name":"loadedfood","directions":1,"delays":[[1.0]]},{"name":"plastic_spoon","directions":1,"delays":[[1.0]]},{"name":"plastic_fork","directions":1,"delays":[[1.0]]},{"name":"plastic_knife","directions":1,"delays":[[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spoon" + }, + { + "name": "fork" + }, + { + "name": "loadedfood" + }, + { + "name": "plastic_spoon" + }, + { + "name": "plastic_fork" + }, + { + "name": "plastic_knife" + } + ] +} diff --git a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/meta.json b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/meta.json index 3b1665413a..b52437d144 100644 --- a/Resources/Textures/Objects/Power/AME/ame_jar.rsi/meta.json +++ b/Resources/Textures/Objects/Power/AME/ame_jar.rsi/meta.json @@ -1,15 +1,14 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/machines/new_ame.dmi at 1b7952787c06c21ef1623e494dcfe7cb1f46e041", - "states": [ - { - "name": "jar", - - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "jar" + } + ] +} diff --git a/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json b/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json index 617023b270..ba432b91cc 100644 --- a/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json +++ b/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json @@ -1,15 +1,14 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/machines/new_ame.dmi at 1b7952787c06c21ef1623e494dcfe7cb1f46e041", - "states": [ - { - "name": "box", - - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "box" + } + ] +} diff --git a/Resources/Textures/Objects/Power/light_bulb.rsi/meta.json b/Resources/Textures/Objects/Power/light_bulb.rsi/meta.json index 7b642e3d2c..2334a9ca37 100644 --- a/Resources/Textures/Objects/Power/light_bulb.rsi/meta.json +++ b/Resources/Textures/Objects/Power/light_bulb.rsi/meta.json @@ -1,23 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/ad7c8621e5567b1b3b2b609f699b3b80cca785f2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit ad7c8621e5567b1b3b2b609f699b3b80cca785f2", - "states": [ - { - "name": "normal" - - }, - { - "name": "burned" - - }, - { - "name": "broken" - - } - ] + { + "name": "burned" + }, + { + "name": "normal" + } + ] } diff --git a/Resources/Textures/Objects/Power/light_tube.rsi/meta.json b/Resources/Textures/Objects/Power/light_tube.rsi/meta.json index 7b642e3d2c..2334a9ca37 100644 --- a/Resources/Textures/Objects/Power/light_tube.rsi/meta.json +++ b/Resources/Textures/Objects/Power/light_tube.rsi/meta.json @@ -1,23 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/ad7c8621e5567b1b3b2b609f699b3b80cca785f2", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit ad7c8621e5567b1b3b2b609f699b3b80cca785f2", - "states": [ - { - "name": "normal" - - }, - { - "name": "burned" - - }, - { - "name": "broken" - - } - ] + { + "name": "burned" + }, + { + "name": "normal" + } + ] } diff --git a/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json b/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json index f88449d89d..5379dae116 100644 --- a/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json +++ b/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers and modified.", + "copyright": "Taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/meta.json b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/meta.json index bdb4163887..083f15f073 100644 --- a/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Atmos/gasanalyzer.rsi/meta.json @@ -1,27 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/ded74aff42136a7953c551a2a94cebc81f62f9fb", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon", - - }, - { - "name": "working", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 3.0, - 0.3, - 0.2, - 0.8 - ] - ] - } - ] -} \ No newline at end of file + { + "name": "working", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 3.0, + 0.3, + 0.2, + 0.8 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector.png b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector.png deleted file mode 100644 index b54b0ee4cb..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector0.png b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector0.png deleted file mode 100644 index c19b268183..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_black.png b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_black.png deleted file mode 100644 index e5c55e28ca..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_black.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_black0.png b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_black0.png deleted file mode 100644 index 700d31bfcd..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_black0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_red.png b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_red.png deleted file mode 100644 index bbf23c5f9e..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_red.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_red0.png b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_red0.png deleted file mode 100644 index cc36291fba..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/autoinjector_red0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/meta.json deleted file mode 100644 index 13101451a7..0000000000 --- a/Resources/Textures/Objects/Specific/Chemistry/autoinjector.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"autoinjector","delays":[[1.0]]},{"name":"autoinjector0","delays":[[1.0]]},{"name":"autoinjector_black","delays":[[1.0]]},{"name":"autoinjector_black0","delays":[[1.0]]},{"name":"autoinjector_red","delays":[[1.0]]},{"name":"autoinjector_red0","delays":[[1.0]]}]} diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png index b79f6f97d3..7f577f668a 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png index 8acf56da76..da6f5180f8 100644 Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json index a772e4aa00..9310fc8467 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json @@ -1,43 +1,43 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beaker" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", - "states": [ - { - "name": "beaker" - }, - { - "name": "lid_beaker" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "beaker1" - }, - { - "name": "beaker2" - }, - { - "name": "beaker3" - }, - { - "name": "beaker4" - }, - { - "name": "beaker5" - }, - { - "name": "beaker6" - } - ] + { + "name": "lid_beaker" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "beaker1" + }, + { + "name": "beaker2" + }, + { + "name": "beaker3" + }, + { + "name": "beaker4" + }, + { + "name": "beaker5" + }, + { + "name": "beaker6" + } + ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json index 66713ed66b..54a2e31b01 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json @@ -1,20 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", - "states": [ - { - "name": "beakerbluespace", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beakerbluespace", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/meta.json index 2fec1bc53f..c322790c13 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_cryostasis.rsi/meta.json @@ -1,39 +1,39 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beakernoreact", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", - "states": [ - { - "name": "beakernoreact", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] - }, - { - "name": "lid_beakernoreact" - } - ] -} \ No newline at end of file + { + "name": "lid_beakernoreact" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png new file mode 100644 index 0000000000..6ec4b0fc67 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png new file mode 100644 index 0000000000..9c73c96809 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json index e56fe43226..7e796830d1 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json @@ -1,35 +1,43 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "beakerlarge" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", - "states": [ - { - "name": "beakerlarge" - }, - { - "name": "lid_beakerlarge" - }, - { - "name": "beakerlarge1" - }, - { - "name": "beakerlarge2" - }, - { - "name": "beakerlarge3" - }, - { - "name": "beakerlarge4" - }, - { - "name": "beakerlarge5" - }, - { - "name": "beakerlarge6" - } - ] + { + "name": "lid_beakerlarge" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "beakerlarge1" + }, + { + "name": "beakerlarge2" + }, + { + "name": "beakerlarge3" + }, + { + "name": "beakerlarge4" + }, + { + "name": "beakerlarge5" + }, + { + "name": "beakerlarge6" + } + ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-left.png new file mode 100644 index 0000000000..566eb81f2a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png new file mode 100644 index 0000000000..5577d69e01 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json index 305333f89c..616fc1b571 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/bottle.rsi/meta.json @@ -1 +1,169 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"bottle","directions":1,"delays":[[1]]},{"name":"bottle-1","directions":1,"delays":[[1]]},{"name":"bottle-2","directions":1,"delays":[[1]]},{"name":"bottle-3","directions":1,"delays":[[1]]},{"name":"bottle-4","directions":1,"delays":[[1]]},{"name":"bottle1","directions":1,"delays":[[1]]},{"name":"bottle10","directions":1,"delays":[[1]]},{"name":"bottle11","directions":1,"delays":[[1]]},{"name":"bottle12","directions":1,"delays":[[1]]},{"name":"bottle13","directions":1,"delays":[[1]]},{"name":"bottle14","directions":1,"delays":[[1]]},{"name":"bottle15","directions":1,"delays":[[1]]},{"name":"bottle16","directions":1,"delays":[[1]]},{"name":"bottle17","directions":1,"delays":[[1]]},{"name":"bottle18","directions":1,"delays":[[1]]},{"name":"bottle19","directions":1,"delays":[[1]]},{"name":"bottle2","directions":1,"delays":[[1]]},{"name":"bottle20","directions":1,"delays":[[1]]},{"name":"bottle3","directions":1,"delays":[[1]]},{"name":"bottle4","directions":1,"delays":[[1]]},{"name":"bottle5","directions":1,"delays":[[1]]},{"name":"bottle6","directions":1,"delays":[[1]]},{"name":"bottle7","directions":1,"delays":[[1]]},{"name":"bottle8","directions":1,"delays":[[1]]},{"name":"bottle9","directions":1,"delays":[[1]]},{"name":"lid_bottle","directions":1,"delays":[[1]]}, {"name": "bottle-1-1", "delays": [[1.0]]}, {"name": "bottle-1-2", "delays": [[1.0]]}, {"name": "bottle-1-3", "delays": [[1.0]]}, {"name": "bottle-1-4", "delays": [[1.0]]}, {"name": "bottle-1-5", "delays": [[1.0]]}, {"name": "bottle-1-6", "delays": [[1.0]]}, {"name": "bottle-2-1", "delays": [[1.0]]}, {"name": "bottle-2-2", "delays": [[1.0]]}, {"name": "bottle-2-3", "delays": [[1.0]]}, {"name": "bottle-2-4", "delays": [[1.0]]}, {"name": "bottle-2-5", "delays": [[1.0]]}, {"name": "bottle-2-6", "delays": [[1.0]]}, {"name": "bottle-3-1", "delays": [[1.0]]}, {"name": "bottle-3-2", "delays": [[1.0]]}, {"name": "bottle-3-3", "delays": [[1.0]]}, {"name": "bottle-3-4", "delays": [[1.0]]}, {"name": "bottle-3-5", "delays": [[1.0]]}, {"name": "bottle-3-6", "delays": [[1.0]]}, {"name": "bottle-4-1", "delays": [[1.0]]}, {"name": "bottle-4-2", "delays": [[1.0]]}, {"name": "bottle-4-3", "delays": [[1.0]]}, {"name": "bottle-4-4", "delays": [[1.0]]}, {"name": "bottle-4-5", "delays": [[1.0]]}, {"name": "bottle-4-6", "delays": [[1.0]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bottle" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "bottle-1" + }, + { + "name": "bottle-2" + }, + { + "name": "bottle-3" + }, + { + "name": "bottle-4" + }, + { + "name": "bottle1" + }, + { + "name": "bottle10" + }, + { + "name": "bottle11" + }, + { + "name": "bottle12" + }, + { + "name": "bottle13" + }, + { + "name": "bottle14" + }, + { + "name": "bottle15" + }, + { + "name": "bottle16" + }, + { + "name": "bottle17" + }, + { + "name": "bottle18" + }, + { + "name": "bottle19" + }, + { + "name": "bottle2" + }, + { + "name": "bottle20" + }, + { + "name": "bottle3" + }, + { + "name": "bottle4" + }, + { + "name": "bottle5" + }, + { + "name": "bottle6" + }, + { + "name": "bottle7" + }, + { + "name": "bottle8" + }, + { + "name": "bottle9" + }, + { + "name": "lid_bottle" + }, + { + "name": "bottle-1-1" + }, + { + "name": "bottle-1-2" + }, + { + "name": "bottle-1-3" + }, + { + "name": "bottle-1-4" + }, + { + "name": "bottle-1-5" + }, + { + "name": "bottle-1-6" + }, + { + "name": "bottle-2-1" + }, + { + "name": "bottle-2-2" + }, + { + "name": "bottle-2-3" + }, + { + "name": "bottle-2-4" + }, + { + "name": "bottle-2-5" + }, + { + "name": "bottle-2-6" + }, + { + "name": "bottle-3-1" + }, + { + "name": "bottle-3-2" + }, + { + "name": "bottle-3-3" + }, + { + "name": "bottle-3-4" + }, + { + "name": "bottle-3-5" + }, + { + "name": "bottle-3-6" + }, + { + "name": "bottle-4-1" + }, + { + "name": "bottle-4-2" + }, + { + "name": "bottle-4-3" + }, + { + "name": "bottle-4-4" + }, + { + "name": "bottle-4-5" + }, + { + "name": "bottle-4-6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/meta.json index c576d85ea3..e99f30446d 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/meta.json @@ -1 +1,29 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"chemg","directions":1,"delays":[[1]]},{"name":"chemg_armed","directions":1,"delays":[[0.1,0.2]]},{"name":"chemg_ass","directions":1,"delays":[[1]]},{"name":"chemg_locked","directions":1,"delays":[[1]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "chemg" + }, + { + "name": "chemg_armed", + "delays": [ + [ + 0.2, + 0.1 + ] + ] + }, + { + "name": "chemg_ass", + }, + { + "name": "chemg_locked", + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json index 0341e9593b..e7e78c01a6 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json @@ -1,25 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dropper" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", - "states": [ - { - "name": "dropper" - }, - { - "name": "dropper1" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "dropper1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Chemistry/effects.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/effects.rsi/meta.json index e5d98a88e0..2de2306323 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/effects.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/effects.rsi/meta.json @@ -1 +1,82 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"chempuff","directions":4,"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]]},{"name":"molten","directions":1,"delays":[[1]]},{"name":"weedpuff","directions":4,"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]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "chempuff", + "directions": 4, + "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 + ] + ] + }, + { + "name": "molten" + }, + { + "name": "weedpuff", + "directions": 4, + "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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/meta.json index 6ca1d8e9cb..0a94375c50 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/fillings.rsi/meta.json @@ -1,5 +1,7 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", "size": { "x": 32, "y": 32 @@ -91,4 +93,4 @@ "name": "vial6" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/hypo.png b/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/hypo.png deleted file mode 100644 index cab29e5b0a..0000000000 Binary files a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/hypo.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/meta.json deleted file mode 100644 index 90c528a760..0000000000 --- a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/meta.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "borghypo", - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "borghypo_s", - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "combat_hypo", - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "hypo", - "delays": [ - [ - 1.0 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Specific/Chemistry/large_grenade.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/large_grenade.rsi/meta.json index adec8dad65..65cfa2397a 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/large_grenade.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/large_grenade.rsi/meta.json @@ -1 +1,29 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"large_grenade","directions":1,"delays":[[1]]},{"name":"large_grenade_armed","directions":1,"delays":[[0.1,0.1]]},{"name":"large_grenade_ass","directions":1,"delays":[[1]]},{"name":"large_grenade_locked","directions":1,"delays":[[1]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "large_grenade" + }, + { + "name": "large_grenade_armed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "large_grenade_ass" + }, + { + "name": "large_grenade_locked" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json index e9753c2951..b394da5df1 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json @@ -1 +1,77 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"pill","directions":1,"delays":[[1]]},{"name":"pill1","directions":1,"delays":[[1]]},{"name":"pill10","directions":1,"delays":[[1]]},{"name":"pill11","directions":1,"delays":[[1]]},{"name":"pill12","directions":1,"delays":[[1]]},{"name":"pill13","directions":1,"delays":[[1]]},{"name":"pill14","directions":1,"delays":[[1]]},{"name":"pill15","directions":1,"delays":[[1]]},{"name":"pill16","directions":1,"delays":[[1]]},{"name":"pill17","directions":1,"delays":[[1]]},{"name":"pill18","directions":1,"delays":[[1]]},{"name":"pill19","directions":1,"delays":[[1]]},{"name":"pill2","directions":1,"delays":[[1]]},{"name":"pill20","directions":1,"delays":[[1]]},{"name":"pill3","directions":1,"delays":[[1]]},{"name":"pill4","directions":1,"delays":[[1]]},{"name":"pill5","directions":1,"delays":[[1]]},{"name":"pill6","directions":1,"delays":[[1]]},{"name":"pill7","directions":1,"delays":[[1]]},{"name":"pill8","directions":1,"delays":[[1]]},{"name":"pill9","directions":1,"delays":[[1]]},{"name":"pill_canister","directions":1,"delays":[[1]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pill" + }, + { + "name": "pill1" + }, + { + "name": "pill10" + }, + { + "name": "pill11" + }, + { + "name": "pill12" + }, + { + "name": "pill13" + }, + { + "name": "pill14" + }, + { + "name": "pill15" + }, + { + "name": "pill16" + }, + { + "name": "pill17" + }, + { + "name": "pill18" + }, + { + "name": "pill19" + }, + { + "name": "pill2" + }, + { + "name": "pill20" + }, + { + "name": "pill3" + }, + { + "name": "pill4" + }, + { + "name": "pill5" + }, + { + "name": "pill6" + }, + { + "name": "pill7" + }, + { + "name": "pill8" + }, + { + "name": "pill9" + }, + { + "name": "pill_canister" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json index 3359fc4d09..1c97f526c5 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/syringe.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris https://github.com/discordia-space/CEV-Eris/commit/989b7b343045f30120c198ee100c9fee7ff8a989", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/syringe.dmi", "states": [ { "name": "syringe_base0" @@ -41,12 +41,12 @@ "name": "syringe4" }, { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json index 49b2968e7c..6c1bb15973 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/vial.rsi/meta.json @@ -1 +1,17 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi","states":[{"name":"lid_vial","directions":1,"delays":[[1]]},{"name":"vial","directions":1,"delays":[[1]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lid_vial" + }, + { + "name": "vial" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Janitorial/light_replacer.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/light_replacer.rsi/meta.json index ea81c49910..ccb6a5e191 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/light_replacer.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/light_replacer.rsi/meta.json @@ -1,25 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/d76180f48949870dd57c7274d494175b3b3515ba", - "states": [ - { - "name": "icon" - }, - { - "name": "emagged" - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "emagged" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json index 63ecea88bf..acea5438bc 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json index 11e324ca7c..c6cd1086d7 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json index 7392d46542..6c11b86921 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json index ce594e4e7b..bc202f443a 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json index 0e1952d1c2..fab67ad463 100644 --- a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit 39659000f380583c35fb814ee2fadab24c2f8076", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/39659000f380583c35fb814ee2fadab24c2f8076", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json index 189f8094ac..bdbd10ef96 100644 --- a/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Morgue/morgue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit 31d88c7454e429a64fbae4a9f7b4aecaf838e9a1", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/31d88c7454e429a64fbae4a9f7b4aecaf838e9a1", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json index 2a15bf86cd..18f31a6587 100644 --- a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide", + "copyright": "CC-BY-SA-3.0", "size": { "x": 32, "y": 32 }, - "license": "Taken from https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide", - "copyright": "CC-BY-SA-3.0", "states": [ { "name": "firstaid" diff --git a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/borghypo.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/borghypo.png rename to Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/borghypo_s.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_s.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/borghypo_s.png rename to Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo_s.png diff --git a/Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/combat_hypo.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/combat_hypo.png similarity index 100% rename from Resources/Textures/Objects/Specific/Chemistry/hypospray.rsi/combat_hypo.png rename to Resources/Textures/Objects/Specific/Medical/hypospray.rsi/combat_hypo.png diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json index 7f9678130e..4ee2261384 100644 --- a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json @@ -1 +1,31 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "Taken from https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1", "copyright": "CC-BY-SA-3.0", "states": [{"name": "hypo", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "borghypo" + }, + { + "name": "borghypo_s" + }, + { + "name": "combat_hypo" + }, + { + "name": "hypo" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json index 261567b87d..39f206039c 100644 --- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json @@ -1,5 +1,7 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 26a7b55bb0..0a13cf7250 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA 3", + "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/17dc39d12005f3279a90212b5c61a781c08693a5", "size": { "x": 32, diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json index 3c1cd5898c..98f91434b0 100644 --- a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-NA 3.0", - "copyright": "https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43", "states": [ { "name": "beaker" diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json index dd8c5dafbc..b032c67d2a 100644 --- a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json index 845b9b8b62..a88e367a85 100644 --- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json index 845b9b8b62..a88e367a85 100644 --- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json index 845b9b8b62..a88e367a85 100644 --- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json index 58fb2d8bc3..b032c67d2a 100644 --- a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json index 58fb2d8bc3..b032c67d2a 100644 --- a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json b/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json index 845b9b8b62..a88e367a85 100644 --- a/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json b/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json index e08f741dd9..840d4d4406 100644 --- a/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json @@ -1,30 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/red.rsi/meta.json b/Resources/Textures/Objects/Tanks/red.rsi/meta.json index dd8c5dafbc..b032c67d2a 100644 --- a/Resources/Textures/Objects/Tanks/red.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/red.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json index dd8c5dafbc..b032c67d2a 100644 --- a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json b/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json index 653ddb2574..c317dd0c4a 100644 --- a/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/cevtile.rsi/meta.json @@ -1 +1,215 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "", "delays": [[1.0]]}, {"name": "tile", "delays": [[1.0]]}, {"name": "tile-white-techfloor", "delays": [[1.0]]}, {"name": "tile_bcarpet", "delays": [[1.0]]}, {"name": "tile_blucarpet", "delays": [[1.0]]}, {"name": "tile_cafe", "delays": [[1.0]]}, {"name": "tile_carpet", "delays": [[1.0]]}, {"name": "tile_dark", "delays": [[1.0]]}, {"name": "tile_dark_bluecorner", "delays": [[1.0]]}, {"name": "tile_dark_brownperforated", "delays": [[1.0]]}, {"name": "tile_dark_brownplatform", "delays": [[1.0]]}, {"name": "tile_dark_cargo", "delays": [[1.0]]}, {"name": "tile_dark_cyancorner", "delays": [[1.0]]}, {"name": "tile_dark_danger", "delays": [[1.0]]}, {"name": "tile_dark_golden", "delays": [[1.0]]}, {"name": "tile_dark_grayperforated", "delays": [[1.0]]}, {"name": "tile_dark_grayplatform", "delays": [[1.0]]}, {"name": "tile_dark_monofloor", "delays": [[1.0]]}, {"name": "tile_dark_orangecorner", "delays": [[1.0]]}, {"name": "tile_dark_panels", "delays": [[1.0]]}, {"name": "tile_dark_techfloor", "delays": [[1.0]]}, {"name": "tile_dark_techfloor_grid", "delays": [[1.0]]}, {"name": "tile_dark_violetcorener", "delays": [[1.0]]}, {"name": "tile_gaycarpet", "delays": [[1.0]]}, {"name": "tile_grass", "delays": [[1.0]]}, {"name": "tile_oracarpet", "delays": [[1.0]]}, {"name": "tile_purcarpet", "delays": [[1.0]]}, {"name": "tile_sblucarpet", "delays": [[1.0]]}, {"name": "tile_steel", "delays": [[1.0]]}, {"name": "tile_steel_bar_dance", "delays": [[1.0]]}, {"name": "tile_steel_bar_flat", "delays": [[1.0]]}, {"name": "tile_steel_bar_light", "delays": [[1.0]]}, {"name": "tile_steel_bluecorner", "delays": [[1.0]]}, {"name": "tile_steel_brownperforated", "delays": [[1.0]]}, {"name": "tile_steel_brownplatform", "delays": [[1.0]]}, {"name": "tile_steel_cargo", "delays": [[1.0]]}, {"name": "tile_steel_cyancorner", "delays": [[1.0]]}, {"name": "tile_steel_danger", "delays": [[1.0]]}, {"name": "tile_steel_golden", "delays": [[1.0]]}, {"name": "tile_steel_grayperforated", "delays": [[1.0]]}, {"name": "tile_steel_grayplatform", "delays": [[1.0]]}, {"name": "tile_steel_monofloor", "delays": [[1.0]]}, {"name": "tile_steel_orangecorner", "delays": [[1.0]]}, {"name": "tile_steel_panels", "delays": [[1.0]]}, {"name": "tile_steel_techfloor", "delays": [[1.0]]}, {"name": "tile_steel_techfloor_grid", "delays": [[1.0]]}, {"name": "tile_steel_violetcorener", "delays": [[1.0]]}, {"name": "tile_techmaint", "delays": [[1.0]]}, {"name": "tile_techmaint_cargo", "delays": [[1.0]]}, {"name": "tile_techmaint_panels", "delays": [[1.0]]}, {"name": "tile_techmaint_perforated", "delays": [[1.0]]}, {"name": "tile_turcarpet", "delays": [[1.0]]}, {"name": "tile_white", "delays": [[1.0]]}, {"name": "tile_white_bluecorner", "delays": [[1.0]]}, {"name": "tile_white_brownperforated", "delays": [[1.0]]}, {"name": "tile_white_brownplatform", "delays": [[1.0]]}, {"name": "tile_white_cargo", "delays": [[1.0]]}, {"name": "tile_white_cyancorner", "delays": [[1.0]]}, {"name": "tile_white_danger", "delays": [[1.0]]}, {"name": "tile_white_golden", "delays": [[1.0]]}, {"name": "tile_white_grayperforated", "delays": [[1.0]]}, {"name": "tile_white_grayplatform", "delays": [[1.0]]}, {"name": "tile_white_monofloor", "delays": [[1.0]]}, {"name": "tile_white_orangecorner", "delays": [[1.0]]}, {"name": "tile_white_panels", "delays": [[1.0]]}, {"name": "tile_white_techfloor_grid", "delays": [[1.0]]}, {"name": "tile_white_violetcorener", "delays": [[1.0]]}, {"name": "tile_wood", "delays": [[1.0]]}]} \ No newline at end of file +{ + "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/Tools/Cowtools/cow_toolbox.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/meta.json index 74e659ca2b..2a6c8b1299 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/cow_toolbox.rsi/meta.json @@ -1,22 +1,22 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@trerri#0107", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cow_toolbox" }, - "license": "CC-BY-SA-3.0", - "copyright": "@trerri#0107", - "states": [ - { - "name": "cow_toolbox" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] - } + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Cowtools/cowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/cowbar.rsi/meta.json index 9f529a6cf9..522cbecc05 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/cowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/cowbar.rsi/meta.json @@ -1,22 +1,22 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@trerri#0107", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cowbar" }, - "license": "CC-BY-SA-3.0", - "copyright": "@trerri#0107", - "states": [ - { - "name": "cowbar" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tools/Cowtools/cowelder.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/cowelder.rsi/meta.json index a71433f42b..bf6cecd449 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/cowelder.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/cowelder.rsi/meta.json @@ -1,39 +1,39 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@trerri#0107", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 & from @trerri#0107", - "states": [ - { - "name": "icon" - }, - { - "name": "welder_flame", - "delays": [ - [ - 0.2, - 0.1 - ] - ] - }, - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 - } + { + "name": "welder_flame", + "delays": [ + [ + 0.2, + 0.1 ] + ] + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 } + ] +} diff --git a/Resources/Textures/Objects/Tools/Cowtools/haycutters.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/haycutters.rsi/meta.json index 88436f7795..40214bcc0c 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/haycutters.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/haycutters.rsi/meta.json @@ -1,22 +1,22 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@trerri#0107", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "haycutters" }, - "license": "CC-BY-SA-3.0", - "copyright": "@trerri#0107", - "states": [ - { - "name": "haycutters" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tools/Cowtools/milkalyzer.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/milkalyzer.rsi/meta.json index c713b10610..d07707b250 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/milkalyzer.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/milkalyzer.rsi/meta.json @@ -1,14 +1,14 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "@trerri#0107", - "states": [ - { - "name": "milkalyzer" - } - ] +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@trerri#0107", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "milkalyzer" + } + ] } diff --git a/Resources/Textures/Objects/Tools/Cowtools/moodriver.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/moodriver.rsi/meta.json index 8441aed3d2..8acfea7ebc 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/moodriver.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/moodriver.rsi/meta.json @@ -1,22 +1,22 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@trerri#0107", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "moodriver" }, - "license": "CC-BY-SA-3.0", - "copyright": "@trerri#0107", - "states": [ - { - "name": "moodriver" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tools/Cowtools/mooltitool.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/mooltitool.rsi/meta.json index e6c356fcdc..dca22c45e8 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/mooltitool.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/mooltitool.rsi/meta.json @@ -1,22 +1,22 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@trerri#0107", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mooltitool" }, - "license": "CC-BY-SA-3.0", - "copyright": "@trerri#0107", - "states": [ - { - "name": "mooltitool" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tools/Cowtools/wronch.rsi/meta.json b/Resources/Textures/Objects/Tools/Cowtools/wronch.rsi/meta.json index db3d12aecf..5db0e205e2 100644 --- a/Resources/Textures/Objects/Tools/Cowtools/wronch.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Cowtools/wronch.rsi/meta.json @@ -1,22 +1,22 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "@trerri#0107", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wronch" }, - "license": "CC-BY-SA-3.0", - "copyright": "@trerri#0107", - "states": [ - { - "name": "wronch" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan black stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-black-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan black stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-black-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan blue stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-blue-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan blue stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-blue-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan lime stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-lime-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan lime stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-lime-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan purple stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-purple-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan purple stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-purple-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan red stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-red-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan red stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-red-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan white stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-white-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan white stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-white-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan yellow stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-yellow-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan yellow stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/cyan-yellow-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green black stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-black-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green black stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-black-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green blue stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-blue-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green blue stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-blue-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green lime stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-lime-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green lime stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-lime-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green purple stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-purple-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green purple stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-purple-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green red stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-red-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green red stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-red-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green white stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-white-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green white stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-white-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green yellow stripe.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-yellow-stripe.png similarity index 100% rename from Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green yellow stripe.png rename to Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/green-yellow-stripe.png diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/shovel.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/shovel.png deleted file mode 100644 index c7eed38171..0000000000 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/shovel.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/spade.png b/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/spade.png deleted file mode 100644 index d76bc3de57..0000000000 Binary files a/Resources/Textures/Objects/Tools/Hydroponics/bags.rsi/spade.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json index b28a6cfba1..5a34e7379b 100644 --- a/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json @@ -9,7 +9,13 @@ "states": [ { "name": "disk", - "delays": [[0.1, 0.1, 0.1]] + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json index 13a8af0d1f..aabb510bd0 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json @@ -1,6 +1,7 @@ { "version": 1, - "copyright": "Taken from https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json index e10590d92d..4cb41a9436 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json @@ -1,6 +1,7 @@ { "version": 1, - "copyright": "Taken from https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json index 13a8af0d1f..aabb510bd0 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json @@ -1,6 +1,7 @@ { "version": 1, - "copyright": "Taken from https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json index 13a8af0d1f..aabb510bd0 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json @@ -1,6 +1,7 @@ { "version": 1, - "copyright": "Taken from https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json index 13a8af0d1f..aabb510bd0 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json @@ -1,6 +1,7 @@ { "version": 1, - "copyright": "Taken from https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json index 13a8af0d1f..aabb510bd0 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json @@ -1,6 +1,7 @@ { "version": 1, - "copyright": "Taken from https://github.com/tgstation/tgstation", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json index ed55a0da60..cc1eaf2707 100644 --- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189", "size": { "x": 32, "y": 32 }, - "license": "CC BY-SA 3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189", "states": [ { "name": "drill_bolt" diff --git a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json index fb3c96e435..f12b27f709 100644 --- a/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/flashlight.rsi/meta.json @@ -1,34 +1,36 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/lighting.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lantern_off" }, - "states": [ - { - "name": "lantern_off" - }, - { - "name": "lantern_on" - }, - { - "name": "HandheldLightOnOverlay" - }, - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 - } - ] + { + "name": "lantern_on" + }, + { + "name": "HandheldLightOnOverlay" + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json index 3b9d3a1538..e6bc717f1c 100644 --- a/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/jaws_of_life.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC BY-SA 3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189", + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f07f847706d85b7cfa4b398e5175732212b69a63", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/lantern.rsi/meta.json b/Resources/Textures/Objects/Tools/lantern.rsi/meta.json index d77491e28c..e040d0598a 100644 --- a/Resources/Textures/Objects/Tools/lantern.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/lantern.rsi/meta.json @@ -1,33 +1,33 @@ { - "version": 1, - "license": "CC BY-SA 3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f", - "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/9bebd81ae0b0a7f952b59886a765c681205de31f", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lantern" }, - "states": [ - { - "name": "lantern" - }, - { - "name": "lantern-on" - }, - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", - "directions": 4 - } - ] + { + "name": "lantern-on" + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json index 403505ee39..bf4315734b 100644 --- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json @@ -27,7 +27,7 @@ "name": "inhand-right", "directions": 4 }, - { + { "name": "green-inhand-left", "directions": 4 }, @@ -35,7 +35,7 @@ "name": "green-inhand-right", "directions": 4 }, - { + { "name": "yellow-inhand-left", "directions": 4 }, @@ -43,7 +43,7 @@ "name": "yellow-inhand-right", "directions": 4 }, - { + { "name": "red-inhand-left", "directions": 4 }, diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json b/Resources/Textures/Objects/Tools/rcd.rsi/meta.json index adc8f4f430..b5a1e00c59 100644 --- a/Resources/Textures/Objects/Tools/rcd.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/rcd.rsi/meta.json @@ -1,30 +1,29 @@ { - "version": 1, - "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/f07f847706d85b7cfa4b398e5175732212b69a63", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC BY-SA 3.0", - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "icon", - - }, - { - "name": "rcd_ammo", - - } - ] + { + "name": "rcd_ammo" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json index 7d8d03c539..5a96c2337b 100644 --- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json @@ -1 +1,28 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}, {"name": "screwdriver"}, {"name": "screwdriver-map"}, {"name": "screwdriver-screwybits"}]} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "screwdriver" + }, + { + "name": "screwdriver-map" + }, + { + "name": "screwdriver-screwybits" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Tools/shovel.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/shovel.rsi/inhand-left.png index 17d86781ee..01af618b99 100644 Binary files a/Resources/Textures/Objects/Tools/shovel.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/shovel.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/shovel.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/shovel.rsi/inhand-right.png index 3c9463c816..15a1473fad 100644 Binary files a/Resources/Textures/Objects/Tools/shovel.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/shovel.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/shovel.rsi/meta.json b/Resources/Textures/Objects/Tools/shovel.rsi/meta.json index ab98f8e78a..21ff65cc26 100644 --- a/Resources/Textures/Objects/Tools/shovel.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/shovel.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "inhand-left", "directions": 4 @@ -14,9 +17,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "icon" } ] } diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json index e601b6033c..d6adbc81ac 100644 --- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json index bf363a1e75..6c5de82cd2 100644 --- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "states": [ { "name": "icon", diff --git a/Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json index 517f0730b6..eacd7478db 100644 --- a/Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_mini.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json index 3845160791..f0d83902d1 100644 --- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json @@ -1 +1,28 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"cutters","directions":1,"delays":[[1.0]]},{"name":"cutters-cutty-thingy","directions":1,"delays":[[1.0]]},{"name":"cutters-map","directions":1,"delays":[[1.0]]},{"name":"inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cutters" + }, + { + "name": "cutters-cutty-thingy" + }, + { + "name": "cutters-map" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json index 70856dbae1..4845380cc0 100644 --- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json @@ -1,10 +1,15 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "inhand-left", "directions": 4 @@ -12,9 +17,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "icon" } ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json index 55dc82377a..01b494cc95 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/clusterbang.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/29c0ed1b000619cb5398ef921000a8d4502ba0b6 and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json index aa77965306..67a112dc09 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json @@ -1,23 +1,23 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/raw/6d8ea1e75ccbd236230b2ed71b6e0bf16d41fc09/icons/obj/grenade.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "primed", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - } - ] + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json index 384230a57d..67a112dc09 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json @@ -1,23 +1,23 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/icons/obj/grenade.dmi at commit 8c96d52deed1eeea28a16334eea549369d7f9974", - "states": [ - { - "name": "icon", - "delays": [ - [1.0] - ] - }, - { - "name": "primed", - "delays": [ - [0.2, 0.2] - ] - } - ] + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json index 384230a57d..52f62726ec 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json @@ -1,23 +1,23 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/icons/obj/grenade.dmi at commit 8c96d52deed1eeea28a16334eea549369d7f9974", - "states": [ - { - "name": "icon", - "delays": [ - [1.0] - ] - }, - { - "name": "primed", - "delays": [ - [0.2, 0.2] - ] - } - ] + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json index 4b97cd883e..708cdc54de 100644 --- a/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json @@ -1,23 +1,24 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/icons/obj/grenade.dmi at commit 8c96d52deed1eeea28a16334eea549369d7f9974", - "states": [ - { - "name": "icon", - "delays": [ - [1.0] - ] - }, - { - "name": "primed", - "delays": [ - [0.2, 0.2, 0.2] - ] - } - ] + { + "name": "primed", + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json index 277149a2d8..c49e5d7013 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [ { "name": "icon" @@ -66,4 +66,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png index dfb67426ea..fc8b984624 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png index 9a7632c76a..e47463f52b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png index 1277964047..43de02d5af 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png index 6a82939cb7..3e6690995b 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png index ca2db4f946..197a0cac69 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png index 6779c8643d..3f7c3289dd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json index adf7f0a84d..f405b7d296 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/3b42532472e7cc1e65bba9d166c27ab6f7ea89b5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 3b42532472e7cc1e65bba9d166c27ab6f7ea89b5", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/meta.json index 358791df47..daa6e45138 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/meta.json @@ -1,11 +1,11 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [ { "name": "icon" diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json index dd69029018..0a9e915eb0 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json @@ -1,76 +1,78 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-0", - "delays": [ - [ - 0.3, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "taser0-inhand-left", - "directions": 4 - }, - { - "name": "taser0-inhand-right", - "directions": 4 - }, - { - "name": "taser1-inhand-left", - "directions": 4 - }, - { - "name": "taser1-inhand-right", - "directions": 4 - }, - { - "name": "taser2-inhand-left", - "directions": 4 - }, - { - "name": "taser2-inhand-right", - "directions": 4 - }, - { - "name": "taser3-inhand-left", - "directions": 4 - }, - { - "name": "taser3-inhand-right", - "directions": 4 - }, - { - "name": "taser4-inhand-left", - "directions": 4 - }, - { - "name": "taser4-inhand-right", - "directions": 4 - } - ] + { + "name": "base" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "taser0-inhand-left", + "directions": 4 + }, + { + "name": "taser0-inhand-right", + "directions": 4 + }, + { + "name": "taser1-inhand-left", + "directions": 4 + }, + { + "name": "taser1-inhand-right", + "directions": 4 + }, + { + "name": "taser2-inhand-left", + "directions": 4 + }, + { + "name": "taser2-inhand-right", + "directions": 4 + }, + { + "name": "taser3-inhand-left", + "directions": 4 + }, + { + "name": "taser3-inhand-right", + "directions": 4 + }, + { + "name": "taser4-inhand-left", + "directions": 4 + }, + { + "name": "taser4-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json index 7c47ce9eae..21ac937d8c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json @@ -1,46 +1,46 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-0", - "delays": [ - [ - 0.3, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json index 1c83729b6a..5349478708 100644 --- a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json @@ -1,43 +1,43 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/meta.json index 377da92a04..367c02ede6 100644 --- a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/meta.json @@ -1,49 +1,49 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/blob/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json index d84b2c302c..80a187bd01 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json @@ -1,31 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/chinalake.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/chinalake.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json index 267b0e8f43..e66bd7fa92 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json @@ -1,36 +1,39 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/guns/projectile/rocket.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/guns/projectile/rocket.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "rocket0-inhand-left", - "directions": 4 - }, - { - "name": "rocket0-inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rocket0-inhand-left", + "directions": 4 + }, + { + "name": "rocket0-inhand-right", + "directions": 4 + }, + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png index 54aa5d121f..84695c1929 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png index e7c52b5bb4..f06ab93260 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/meta.json index 52e7516fdf..a5f2c59538 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/clarissa.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/clarissa.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/meta.json index 1e25889f6a..86f9e56733 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/meta.json @@ -1,31 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/colt.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/colt.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png index 54aa5d121f..e3c8c9bdfc 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png index e7c52b5bb4..ebdaddb1e1 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/meta.json index 90e00d22c2..6d984733a2 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json index f621410e9b..7eef4dc9c1 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json @@ -1,28 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/gyropistol.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/gyropistol.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png index 54aa5d121f..79233fd074 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png index e7c52b5bb4..e6444383e9 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json index 0a30fe5c37..99a121e05a 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json @@ -1,31 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/hm_pistol.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/hm_pistol.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json index 9f1b66babf..365b7da2af 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json @@ -1,43 +1,43 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "base-unshaded" - }, - { - "name": "mag-0" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "base-unshaded" + }, + { + "name": "mag-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/meta.json index b46b116eee..4dc7612360 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/mandella.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/mandella.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png index 54aa5d121f..97ca5a80ec 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png index e7c52b5bb4..7efc0f30fd 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json index cc4600d356..0294bbe32f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json @@ -1,31 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png index 54aa5d121f..4de85760c5 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png index e7c52b5bb4..56eaeab03e 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/meta.json index cc4600d356..0294bbe32f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/meta.json @@ -1,31 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json index 3a19acc7bd..c9887b95b8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/molly.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/molly.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/meta.json index 4ee625b268..016a82a61e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/meta.json @@ -1,59 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json index 7caadb88ec..b305e142c4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/paco.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/paco.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/buckshot.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/buckshot.rsi/meta.json index 8d92fddcc9..706868841e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/buckshot.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/buckshot.rsi/meta.json @@ -1,14 +1,14 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", - "states": [ - { - "name": "base" - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet.rsi/meta.json index 9debc86be7..315049577d 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet.rsi/meta.json @@ -1,20 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", - "states": [ - { - "name": "bullet", - "delays": [ - [ - 0.05, - 0.05 - ] - ] - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bullet", + "delays": [ + [ + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/meta.json index 4ccea521c8..db2bdf642c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/meta.json @@ -1,20 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", - "states": [ - { - "name": "grenade", - "delays": [ - [ - 0.05, - 0.05 - ] - ] - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "grenade", + "delays": [ + [ + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/meta.json index ff0cf14a45..2aab874a12 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/meta.json @@ -1,17 +1,17 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/guns/projectile/rocket.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "frag" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/guns/projectile/rocket.dmi", - "states": [ - { - "name": "frag" - }, - { - "name": "smallfrag" - } - ] + { + "name": "smallfrag" + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/slug.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/slug.rsi/meta.json index 8d92fddcc9..706868841e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/slug.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/slug.rsi/meta.json @@ -1,14 +1,14 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", - "states": [ - { - "name": "base" - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/spark.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/spark.rsi/meta.json index 61576c16ca..a78ef50b2b 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/spark.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/spark.rsi/meta.json @@ -1,20 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "GPL3", - "copyright": "https://github.com/tgstation/tgstation/raw/64e5682495a3d3383546b3bfcd4732c32f09b419/icons/obj/projectiles.dmi", - "states": [ - { - "name": "spark", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - } - ] -} \ No newline at end of file + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spark", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json index 0abcdda366..7c0154a65a 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json @@ -1,43 +1,43 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-unshaded-0" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json index cd602b9efd..e159224221 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json @@ -1,50 +1,22 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] -} \ No newline at end of file + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json index cd602b9efd..e159224221 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json @@ -1,50 +1,22 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] -} \ No newline at end of file + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json index d2a35cc0b4..6d2cbbad28 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json @@ -1,28 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json index d2a35cc0b4..6d2cbbad28 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json @@ -1,28 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json index 8b395bb06c..9a0a9b174c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/calico.rsi/meta.json @@ -1,28 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Yeeye", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "Yeeye", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json index 6d45904d38..69abd331be 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/carabine.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/carabine.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/dallas.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/dallas.rsi/meta.json index d2a35cc0b4..6d2cbbad28 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/dallas.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/dallas.rsi/meta.json @@ -1,28 +1,28 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json index 98e690a4b1..dd5b5244ad 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/meta.json index 338a557144..199ffa6c06 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/projectile/vintorez.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/projectile/vintorez.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json index 6607a59045..66daf324e1 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/wintermute.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/wintermute.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json index 215e350405..0e540736a2 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/atreides.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/atreides.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json index dc0327f6fe..e9768ab608 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json index c699d438e5..1843fa97b8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "suppressor" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "suppressor" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json index 9af093356b..b4165b3b6c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json @@ -1,148 +1,148 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "base-unshaded", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-0", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-0", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-1", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-1", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-2", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-2", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-3", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-3", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-4", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-4", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-5", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "mag-unshaded-5", - "delays": [ - [ - 0.1, - 0.3 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "base-unshaded", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-0", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-1", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-1", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-2", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-2", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-3", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-3", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-4", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-4", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-5", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-5", + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/zoric.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/zoric.rsi/meta.json index 89fb68686c..d02df0e964 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/zoric.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/zoric.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/projectile/zoric.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/projectile/zoric.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json index d255715bbe..eac5d35284 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json @@ -1,34 +1,34 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/bojevic.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/bojevic.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bull.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bull.rsi/meta.json index 7535c07f6f..56c995b125 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bull.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bull.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/bull.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/bull.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-unshaded-1" - }, - { - "name": "mag-unshaded-2" - }, - { - "name": "mag-unshaded-3" - }, - { - "name": "mag-unshaded-4" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json index 04ac247095..07a98ccbb3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json @@ -1,31 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/dshotgun.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/dshotgun.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/meta.json index acacf92772..132b506553 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/gladstone.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/gladstone.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json index dbfd6dd398..949689be72 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/c4f3f5c97c361e66cc93219702ea11f49b9d41bb/icons/obj/guns/projectile/shotgun.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/c4f3f5c97c361e66cc93219702ea11f49b9d41bb/icons/obj/guns/projectile/shotgun.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/regulator.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/regulator.rsi/meta.json index ce9338bfb7..66e38cd36f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/regulator.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/regulator.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/regulator.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/regulator.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json index 1372df90c6..aa3dfbd5e1 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json @@ -1,31 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/sawnshotgun.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/sawnshotgun.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/meta.json index 59c0a6467a..72863fbac8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun.rsi/meta.json @@ -1,31 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json index 59c0a6467a..72863fbac8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json @@ -1,31 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/boltgun.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json index 9e3b8f2a5e..b31fc04c70 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json @@ -1,31 +1,31 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/heavysniper.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/heavysniper.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png new file mode 100644 index 0000000000..ea90cafb92 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png new file mode 100644 index 0000000000..ff87ea8c7c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png new file mode 100644 index 0000000000..0eed1badec Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json new file mode 100644 index 0000000000..2c493b673f --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png index 474a6def70..d5f8656886 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png index 3f5faacb2b..b0415abc98 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json index 27606fd79e..aa6abfee3b 100644 --- a/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json @@ -1,23 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/31615/commits/8795484578b33a9919b7801667287c0f28afe642", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/31615/commits/8795484578b33a9919b7801667287c0f28afe642", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } - diff --git a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json index 3928d83f59..266149d72c 100644 --- a/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/meta.json @@ -1 +1,22 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "butch", "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "butch" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json index 685357b828..4da2fb5bd2 100644 --- a/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at commit https://github.com/tgstation/tgstation/pull/30680/commits/a494d500b42bc8c7275c57219e08e65b825e94f6", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/30680/commits/a494d500b42bc8c7275c57219e08e65b825e94f6", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json index 73f187c296..200e7edafe 100644 --- a/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken/modified from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken and modified by Taral from goonstation at commit https://github.com/goonstation/goonstation/pull/2816/commits/b99c5dff45a6527bbf698bc00f7d24b8ca75a806", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 }, - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "icon" - } - ] + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/flash.rsi/meta.json index 5148fde3de..aec86f1f37 100644 --- a/Resources/Textures/Objects/Weapons/Melee/flash.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/flash.rsi/meta.json @@ -1,37 +1,35 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "burnt" }, - "license": "CC BY-SA 3.0", - "copyright": "Taken from CEV Eris", - "states": [ - { - "name": "flash", - - }, - { - "name": "flashing", - "delays": [ - [ - 0.1, - 0.1, - 0.3 - ] - ] - }, - { - "name": "burnt", - - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - } - ] + { + "name": "flash" + }, + { + "name": "flashing", + "delays": [ + [ + 0.1, + 0.1, + 0.3 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json index 8c87c6bc1c..5641efbb3a 100644 --- a/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/gohei.rsi/meta.json @@ -1,21 +1,21 @@ { - "version": 1, - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/799647e170c9b7dbdbb28bdf46234e012b6bd6c8", - "size": { - "x": 32, - "y": 32 + "version": 1, + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/799647e170c9b7dbdbb28bdf46234e012b6bd6c8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4, }, - "states": [ - { - "name": "inhand-left", - "directions": 4, - }, - { - "name": "inhand-right", - "directions": 4, - }, - { - "name": "gohei" - } - ] + { + "name": "inhand-right", + "directions": 4, + }, + { + "name": "gohei" + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json index 0b41dd4a49..b2c66cff5b 100644 --- a/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken/modified from tgstation at commit https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json index c4fc80f1e6..8e9c566c5c 100644 --- a/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/kitchen_knife.rsi/meta.json @@ -1,22 +1,22 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/baeadc0388aba2e74106f99b1551a465b825e3b1", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/baeadc0388aba2e74106f99b1551a465b825e3b1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png new file mode 100644 index 0000000000..25ad0a8bf7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png new file mode 100644 index 0000000000..f0815e8c6b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png new file mode 100644 index 0000000000..346c636e54 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json new file mode 100644 index 0000000000..a7df3b3f7a --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Taken from TerraGov-Marine-Corps and modified by Taral at https://github.com/tgstation/TerraGov-Marine-Corps/commit/4c8cb6eb48dece03478b0f83542855f7c63b793e#diff-a67180777ae47f2c84f3ebf93c61442bbe34aebcad5b7cbd76feb78f177bcee1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json index ed0f963111..483c049a3d 100644 --- a/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/pickaxe.rsi/meta.json @@ -1 +1,22 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pickaxe", "delays": [[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "pickaxe" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json index a26c1bc5ba..2d727ff632 100644 --- a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/meta.json @@ -1,20 +1,22 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 }, - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "spear" - } - ] + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "spear" + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json index 9f50df0b1b..16b94ac0a8 100644 --- a/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/stunbaton.rsi/meta.json @@ -1,107 +1,103 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stunbaton_off" }, - "license": "CC BY-SA 3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at b8758256b31013946fdbd320ca043a663c399656", - "states": - [ - { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "off-inhand-right", - "directions": 4 - }, - { - "name": "on-inhand-left", - "directions": 4, - "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, - ], - ] - }, - { - "name": "on-inhand-right", - "directions": 4, - "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, - ], - ] - }, - { - "name": "stunbaton_off", - - }, - { - "name": "stunbaton_nocell", - - }, - { - "name": "stunbaton_on", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - ] - ] - } - - ] + { + "name": "stunbaton_nocell" + }, + { + "name": "stunbaton_on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4, + "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, + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "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, + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/xeno_claw.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/xeno_claw.rsi/meta.json index 85017ada93..a0ef37efb5 100644 --- a/Resources/Textures/Objects/Weapons/Melee/xeno_claw.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/xeno_claw.rsi/meta.json @@ -1,20 +1,20 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/eb0d3b2552537b2be044c6bf42e5c65268ee0e56", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/7344da18b5e3dd0b1994a84e9c9c0774d71b93a5/icons/mob/alien.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left" - }, - { - "name": "inhand-right" - } - ] -} \ No newline at end of file + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + } + ] +} diff --git a/RobustToolbox b/RobustToolbox index c4946b8466..7c008e857d 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit c4946b8466cea56b1184e20f61a8143fa913c6f3 +Subproject commit 7c008e857d305b8d6e617113cebdfc77d0ab52b9 diff --git a/SpaceStation14.sln b/SpaceStation14.sln index e41dbefb10..907c87ec96 100644 --- a/SpaceStation14.sln +++ b/SpaceStation14.sln @@ -64,11 +64,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{806ED41A EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", "RobustToolbox\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj", "{41B450C0-A361-4CD7-8121-7072B8995CFC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{DDD55F86-0406-42E5-8443-93EDC6BB2D75}" - ProjectSection(SolutionItems) = preProject - RobustToolbox\Tools\download_natives.py = RobustToolbox\Tools\download_natives.py - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustToolbox\NetSerializer\NetSerializer\NetSerializer.csproj", "{7B9472D3-79D4-48D1-9B22-BCDE518FE842}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Physics", "RobustToolbox\Robust.Physics\Robust.Physics.csproj", "{3BC34700-882F-426B-82BB-56D5708B5E0D}" @@ -97,6 +92,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.YAMLLinter", "Conte EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Benchmarks", "RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj", "{8A21C7CA-2EB8-40E5-8043-33582C06D139}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -217,6 +214,10 @@ Global {A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Release|Any CPU.Build.0 = Release|Any CPU + {8A21C7CA-2EB8-40E5-8043-33582C06D139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A21C7CA-2EB8-40E5-8043-33582C06D139}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A21C7CA-2EB8-40E5-8043-33582C06D139}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A21C7CA-2EB8-40E5-8043-33582C06D139}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -232,7 +233,6 @@ Global {4809F412-3132-419E-BF9D-CCF7593C3533} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {50404922-9637-4394-BF59-165D0850ADC8} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} - {DDD55F86-0406-42E5-8443-93EDC6BB2D75} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {3BC34700-882F-426B-82BB-56D5708B5E0D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} @@ -245,6 +245,7 @@ Global {440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880} {88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} {A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} + {8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A}