diff --git a/Content.Client/Commands/DebugAiCommand.cs b/Content.Client/Commands/DebugAiCommand.cs index 1d463e3072..f5c3088215 100644 --- a/Content.Client/Commands/DebugAiCommand.cs +++ b/Content.Client/Commands/DebugAiCommand.cs @@ -54,8 +54,9 @@ namespace Content.Client.Commands } return !anyAction; -#endif +#else return true; +#endif } } } diff --git a/Content.Client/Commands/DebugPathfindingCommand.cs b/Content.Client/Commands/DebugPathfindingCommand.cs index 8549ed1929..adc4760767 100644 --- a/Content.Client/Commands/DebugPathfindingCommand.cs +++ b/Content.Client/Commands/DebugPathfindingCommand.cs @@ -55,8 +55,9 @@ namespace Content.Client.Commands } return !anyAction; -#endif +#else return true; +#endif } } } diff --git a/Content.Client/Commands/ToggleOutlineCommand.cs b/Content.Client/Commands/ToggleOutlineCommand.cs new file mode 100644 index 0000000000..a96c9e40a5 --- /dev/null +++ b/Content.Client/Commands/ToggleOutlineCommand.cs @@ -0,0 +1,24 @@ +using Robust.Client.Interfaces.Console; +using Robust.Shared.Interfaces.Configuration; +using Robust.Shared.IoC; + +namespace Content.Client.Commands +{ + public class ToggleOutlineCommand : IConsoleCommand + { + public string Command => "toggleoutline"; + + public string Description => "Toggles outline drawing on entities."; + + public string Help => ""; + + public bool Execute(IDebugConsole console, params string[] args) + { + var _configurationManager = IoCManager.Resolve(); + var old = _configurationManager.GetCVar("outline.enabled"); + _configurationManager.SetCVar("outline.enabled", !old); + console.AddLine($"Draw outlines set to: {_configurationManager.GetCVar("outline.enabled")}"); + return false; + } + } +} diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index 799a9cfd56..bd4fa31610 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -24,6 +24,7 @@ using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.State; using Robust.Client.Player; using Robust.Shared.ContentPack; +using Robust.Shared.Interfaces.Configuration; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; @@ -41,6 +42,7 @@ namespace Content.Client [Dependency] private readonly IEscapeMenuOwner _escapeMenuOwner; [Dependency] private readonly IGameController _gameController; [Dependency] private readonly IStateManager _stateManager; + [Dependency] private readonly IConfigurationManager _configurationManager; #pragma warning restore 649 public override void Init() @@ -85,8 +87,6 @@ namespace Content.Client "Multitool", "Wrench", "Crowbar", - "HitscanWeapon", - "ProjectileWeapon", "Projectile", "MeleeWeapon", "Storeable", @@ -100,8 +100,8 @@ namespace Content.Client "LightBulb", "Healing", "Catwalk", - "BallisticMagazine", - "BallisticBullet", + "RangedMagazine", + "Ammo", "HitscanWeaponCapacitor", "PowerCell", "WeaponCapacitorCharger", @@ -144,6 +144,13 @@ namespace Content.Client "Bucket", "Puddle", "CanSpill", + "SpeedLoader", + "Hitscan", + "BoltActionBarrel", + "PumpBarrel", + "RevolverBarrel", + "ExplosiveProjectile", + "StunnableProjectile", "RandomPottedPlant", "CommunicationsConsole", "BarSign", @@ -162,6 +169,10 @@ namespace Content.Client "SecureEntityStorage", "PresetIdCard", "SolarControlConsole", + "BatteryBarrel", + "FlashExplosive", + "FlashProjectile", + "Utensil", }; foreach (var ignoreName in registerIgnore) @@ -209,6 +220,8 @@ namespace Content.Client { IoCManager.Resolve().CreateNewMapEntity(MapId.Nullspace); }; + + _configurationManager.RegisterCVar("outline.enabled", true); } /// diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs index 50a3497bc8..be08f468c0 100644 --- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs @@ -95,6 +95,9 @@ namespace Content.Client.GameObjects.Components.Doors public override void OnChangeData(AppearanceComponent component) { + if (component.Owner.Deleted) + return; + var sprite = component.Owner.GetComponent(); var animPlayer = component.Owner.GetComponent(); if (!component.TryGetData(DoorVisuals.VisualState, out DoorVisualState state)) diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs index 2410ca7c26..92085c56bf 100644 --- a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs +++ b/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs @@ -203,31 +203,30 @@ namespace Content.Client.GameObjects buttonDict.Add(slot, button); } - const int size = ButtonSize; - const int sep = ButtonSeparation; - const int rSep = RightSeparation; + const int sizep = (ButtonSize + ButtonSeparation); // Left column. - AddButton(Slots.EYES, "glasses", (0, size + sep)); - AddButton(Slots.INNERCLOTHING, "uniform", (0, 2 * (size + sep))); - AddButton(Slots.EXOSUITSLOT1, "suit_storage", (0, 3 * (size + sep))); + AddButton(Slots.EYES, "glasses", (0, 0)); + AddButton(Slots.NECK, "neck", (0, sizep)); + AddButton(Slots.INNERCLOTHING, "uniform", (0, 2 * sizep)); // Middle column. - AddButton(Slots.HEAD, "head", (size + sep, 0)); - AddButton(Slots.MASK, "mask", (size + sep, size + sep)); - AddButton(Slots.OUTERCLOTHING, "suit", (size + sep, 2 * (size + sep))); - AddButton(Slots.SHOES, "shoes", (size + sep, 3 * (size + sep))); + AddButton(Slots.HEAD, "head", (sizep, 0)); + AddButton(Slots.MASK, "mask", (sizep, sizep)); + AddButton(Slots.OUTERCLOTHING, "suit", (sizep, 2 * sizep)); + AddButton(Slots.SHOES, "shoes", (sizep, 3 * sizep)); // Right column - AddButton(Slots.EARS, "ears", (2 * (size + sep), 0)); - AddButton(Slots.IDCARD, "id", (2 * (size + sep), size + sep)); - AddButton(Slots.GLOVES, "gloves", (2 * (size + sep), 2 * (size + sep))); + AddButton(Slots.EARS, "ears", (2 * sizep, 0)); + AddButton(Slots.IDCARD, "id", (2 * sizep, sizep)); + AddButton(Slots.EXOSUITSLOT1, "suit_storage", (2 * sizep, 2 * sizep)); + AddButton(Slots.POCKET1, "pocket", (2 * sizep, 3 * sizep)); // Far right column. - AddButton(Slots.BACKPACK, "back", (rSep + 3 * (size + sep), 0)); - AddButton(Slots.BELT, "belt", (rSep + 3 * (size + sep), size + sep)); - AddButton(Slots.POCKET1, "pocket", (rSep + 3 * (size + sep), 2 * (size + sep))); - AddButton(Slots.POCKET2, "pocket", (rSep + 3 * (size + sep), 3 * (size + sep))); + AddButton(Slots.BACKPACK, "back", (3 * sizep, 0)); + AddButton(Slots.BELT, "belt", (3 * sizep, sizep)); + AddButton(Slots.GLOVES, "gloves", (3 * sizep, 2 * sizep)); + AddButton(Slots.POCKET2, "pocket", (3 * sizep, 3 * sizep)); } } } diff --git a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs index f7f1e3c815..b5ae7f7b05 100644 --- a/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs +++ b/Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs @@ -59,7 +59,7 @@ namespace Content.Client.GameObjects public IEntity GetEntity(string index) { - if (_hands.TryGetValue(index, out var entity)) + if (!string.IsNullOrEmpty(index) && _hands.TryGetValue(index, out var entity)) { return entity; } @@ -166,6 +166,8 @@ namespace Content.Client.GameObjects { _hands.Add(slot, null); } + + serializer.DataField(this, x => ActiveIndex, "defaultHand", _hands.Keys.LastOrDefault()); } public override void HandleMessage(ComponentMessage message, IComponent component) diff --git a/Content.Client/GameObjects/Components/Weapons/ClientFlashableComponent.cs b/Content.Client/GameObjects/Components/Weapons/ClientFlashableComponent.cs new file mode 100644 index 0000000000..b521ff0371 --- /dev/null +++ b/Content.Client/GameObjects/Components/Weapons/ClientFlashableComponent.cs @@ -0,0 +1,149 @@ +using System; +using System.Threading; +using Content.Shared.GameObjects.Components.Weapons; +using Robust.Client.Graphics.Drawing; +using Robust.Client.Graphics.Overlays; +using Robust.Client.Interfaces.Graphics; +using Robust.Client.Interfaces.Graphics.Overlays; +using Robust.Client.Player; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Maths; +using Robust.Shared.Utility; +using Timer = Robust.Shared.Timers.Timer; + +namespace Content.Client.GameObjects.Components.Weapons +{ + [RegisterComponent] + public sealed class ClientFlashableComponent : SharedFlashableComponent + { + private CancellationTokenSource _cancelToken; + private TimeSpan _startTime; + private double _duration; + private FlashOverlay _overlay; + + public override void HandleComponentState(ComponentState curState, ComponentState nextState) + { + if (curState == null) + { + return; + } + + var playerManager = IoCManager.Resolve(); + if (playerManager.LocalPlayer.ControlledEntity != Owner) + { + return; + } + + var newState = (FlashComponentState) curState; + if (newState.Time == default) + { + return; + } + + // Few things here: + // 1. If a shorter duration flash is applied then don't do anything + // 2. If the client-side time is later than when the flash should've ended don't do anything + var currentTime = IoCManager.Resolve().CurTime.TotalSeconds; + var newEndTime = newState.Time.TotalSeconds + newState.Duration; + var currentEndTime = _startTime.TotalSeconds + _duration; + + if (currentEndTime > newEndTime) + { + return; + } + + if (currentTime > newEndTime) + { + DisableOverlay(); + return; + } + + _startTime = newState.Time; + _duration = newState.Duration; + + EnableOverlay(newEndTime - currentTime); + } + + private void EnableOverlay(double duration) + { + // If the timer gets reset + if (_overlay != null) + { + _overlay.Duration = _duration; + _overlay.StartTime = _startTime; + _cancelToken.Cancel(); + } + else + { + var overlayManager = IoCManager.Resolve(); + _overlay = new FlashOverlay(_duration); + overlayManager.AddOverlay(_overlay); + } + + _cancelToken = new CancellationTokenSource(); + Timer.Spawn((int) duration * 1000, DisableOverlay, _cancelToken.Token); + } + + private void DisableOverlay() + { + if (_overlay == null) + { + return; + } + + var overlayManager = IoCManager.Resolve(); + overlayManager.RemoveOverlay(_overlay.ID); + _overlay = null; + _cancelToken.Cancel(); + _cancelToken = null; + } + } + + public sealed class FlashOverlay : Overlay + { + public override OverlaySpace Space => OverlaySpace.ScreenSpace; + private readonly IGameTiming _timer; + private readonly IClyde _displayManager; + public TimeSpan StartTime { get; set; } + public double Duration { get; set; } + public FlashOverlay(double duration) : base(nameof(FlashOverlay)) + { + _timer = IoCManager.Resolve(); + _displayManager = IoCManager.Resolve(); + StartTime = _timer.CurTime; + Duration = duration; + } + + protected override void Draw(DrawingHandleBase handle) + { + var elapsedTime = (_timer.CurTime - StartTime).TotalSeconds; + if (elapsedTime > Duration) + { + return; + } + var screenHandle = (DrawingHandleScreen) handle; + + screenHandle.DrawRect( + new UIBox2(0.0f, 0.0f, _displayManager.ScreenSize.X, _displayManager.ScreenSize.Y), + Color.White.WithAlpha(GetAlpha(elapsedTime / Duration)) + ); + } + + private float GetAlpha(double ratio) + { + // Ideally you just want a smooth slope to finish it so it's not jarring at the end + // By all means put in a better curve + const float slope = -9.0f; + const float exponent = 0.1f; + const float yOffset = 9.0f; + const float xOffset = 0.0f; + + // Overkill but easy to adjust if you want to mess around with the design + var result = (float) Math.Clamp(slope * (float) Math.Pow(ratio - xOffset, exponent) + yOffset, 0.0, 1.0); + DebugTools.Assert(!float.IsNaN(result)); + return result; + } + } +} diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineVisualizer2D.cs deleted file mode 100644 index d4248ccdc6..0000000000 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineVisualizer2D.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Content.Shared.GameObjects.Components.Weapons.Ranged; -using Content.Shared.Utility; -using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Utility; -using YamlDotNet.RepresentationModel; - -namespace Content.Client.GameObjects.Components.Weapons.Ranged -{ - public sealed class BallisticMagazineVisualizer2D : AppearanceVisualizer - { - private string _baseState; - private int _steps; - - public override void LoadData(YamlMappingNode node) - { - base.LoadData(node); - - _baseState = node.GetNode("base_state").AsString(); - _steps = node.GetNode("steps").AsInt(); - } - - public override void OnChangeData(AppearanceComponent component) - { - var sprite = component.Owner.GetComponent(); - - if (!component.TryGetData(BallisticMagazineVisuals.AmmoCapacity, out int capacity)) - { - return; - } - if (!component.TryGetData(BallisticMagazineVisuals.AmmoLeft, out int current)) - { - return; - } - - var step = ContentHelpers.RoundToLevels(current, capacity, _steps); - - sprite.LayerSetState(0, $"{_baseState}-{step}"); - } - } -} diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs deleted file mode 100644 index 0b34b2859b..0000000000 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Content.Shared.GameObjects.Components.Weapons.Ranged; -using Content.Shared.Utility; -using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Utility; -using YamlDotNet.RepresentationModel; - -namespace Content.Client.GameObjects.Components.Weapons.Ranged -{ - public sealed class BallisticMagazineWeaponVisualizer2D : AppearanceVisualizer - { - private string _baseState; - private int _steps; - - public override void LoadData(YamlMappingNode node) - { - base.LoadData(node); - - _baseState = node.GetNode("base_state").AsString(); - _steps = node.GetNode("steps").AsInt(); - } - - public override void OnChangeData(AppearanceComponent component) - { - var sprite = component.Owner.GetComponent(); - - component.TryGetData(BallisticMagazineWeaponVisuals.MagazineLoaded, out bool loaded); - - if (loaded) - { - if (!component.TryGetData(BallisticMagazineWeaponVisuals.AmmoCapacity, out int capacity)) - { - return; - } - if (!component.TryGetData(BallisticMagazineWeaponVisuals.AmmoLeft, out int current)) - { - return; - } - - // capacity is - 1 as normally a bullet is chambered so max state is virtually never hit. - var step = ContentHelpers.RoundToLevels(current, capacity - 1, _steps); - sprite.LayerSetState(0, $"{_baseState}-{step}"); - } - else - { - sprite.LayerSetState(0, _baseState); - } - } - } -} diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs similarity index 91% rename from Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponent.cs rename to Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs index ce6e540298..adf93dc3ab 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs @@ -1,28 +1,26 @@ -using System; +using System; using Content.Client.Animations; -using Content.Client.UserInterface; using Content.Client.UserInterface.Stylesheets; using Content.Client.Utility; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Weapons.Ranged; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; using Robust.Client.Animations; using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Animations; using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Maths; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using static Content.Client.StaticIoC; -namespace Content.Client.GameObjects.Components.Weapons.Ranged +namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels { [RegisterComponent] - public class BallisticMagazineWeaponComponent : Component, IItemStatus + public class ClientMagazineBarrelComponent : Component, IItemStatus { private static readonly Animation AlarmAnimationSmg = new Animation { @@ -70,8 +68,8 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged } }; - public override string Name => "BallisticMagazineWeapon"; - public override uint? NetID => ContentNetIDs.BALLISTIC_MAGAZINE_WEAPON; + public override string Name => "MagazineBarrel"; + public override uint? NetID => ContentNetIDs.MAGAZINE_BARREL; private StatusControl _statusControl; @@ -101,11 +99,11 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged public override void HandleComponentState(ComponentState curState, ComponentState nextState) { - if (!(curState is BallisticMagazineWeaponComponentState cast)) + if (!(curState is MagazineBarrelComponentState cast)) return; Chambered = cast.Chambered; - MagazineCount = cast.MagazineCount; + MagazineCount = cast.Magazine; _statusControl?.Update(); } @@ -115,7 +113,8 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged switch (message) { - case BmwComponentAutoEjectedMessage _: + + case MagazineAutoEjectMessage _: _statusControl?.PlayAlarmAnimation(); return; } @@ -138,13 +137,13 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged private sealed class StatusControl : Control { - private readonly BallisticMagazineWeaponComponent _parent; + private readonly ClientMagazineBarrelComponent _parent; private readonly HBoxContainer _bulletsListTop; private readonly HBoxContainer _bulletsListBottom; private readonly TextureRect _chamberedBullet; private readonly Label _noMagazineLabel; - public StatusControl(BallisticMagazineWeaponComponent parent) + public StatusControl(ClientMagazineBarrelComponent parent) { _parent = parent; SizeFlagsHorizontal = SizeFlags.FillExpand; @@ -181,7 +180,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged }, (_chamberedBullet = new TextureRect { - Texture = ResC.GetTexture("/Textures/UserInterface/status/bullets/chambered.png"), + Texture = StaticIoC.ResC.GetTexture("/Textures/UserInterface/status/bullets/chambered.png"), SizeFlagsVertical = SizeFlags.ShrinkCenter, SizeFlagsHorizontal = SizeFlags.ShrinkEnd | SizeFlags.Fill, }) @@ -223,7 +222,7 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged texturePath = "/Textures/UserInterface/status/bullets/tiny.png"; } - var texture = ResC.GetTexture(texturePath); + var texture = StaticIoC.ResC.GetTexture(texturePath); const int tinyMaxRow = 60; @@ -282,4 +281,4 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged } } } -} +} \ No newline at end of file diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer2D.cs new file mode 100644 index 0000000000..3a074f0c97 --- /dev/null +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer2D.cs @@ -0,0 +1,38 @@ +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; + +namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers +{ + [UsedImplicitly] + public sealed class BarrelBoltVisualizer2D : AppearanceVisualizer + { + public override void InitializeEntity(IEntity entity) + { + base.InitializeEntity(entity); + var sprite = entity.GetComponent(); + sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, $"bolt-open"); + } + + public override void OnChangeData(AppearanceComponent component) + { + var sprite = component.Owner.GetComponent(); + + if (!component.TryGetData(BarrelBoltVisuals.BoltOpen, out bool boltOpen)) + { + return; + } + + if (boltOpen) + { + sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-open"); + } + else + { + sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-closed"); + } + } + } +} \ No newline at end of file diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer2D.cs new file mode 100644 index 0000000000..9d087c2505 --- /dev/null +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer2D.cs @@ -0,0 +1,110 @@ +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.Utility; +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Utility; +using YamlDotNet.RepresentationModel; + +namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers +{ + [UsedImplicitly] + public sealed class MagVisualizer2D : AppearanceVisualizer + { + private bool _magLoaded; + private string _magState; + private int _magSteps; + private bool _zeroVisible; + + public override void LoadData(YamlMappingNode node) + { + base.LoadData(node); + _magState = node.GetNode("magState").AsString(); + _magSteps = node.GetNode("steps").AsInt(); + _zeroVisible = node.GetNode("zeroVisible").AsBool(); + } + + public override void InitializeEntity(IEntity entity) + { + base.InitializeEntity(entity); + var sprite = entity.GetComponent(); + + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _)) + { + sprite.LayerSetState(RangedBarrelVisualLayers.Mag, $"{_magState}-{_magSteps-1}"); + sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false); + } + + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) + { + sprite.LayerSetState(RangedBarrelVisualLayers.MagUnshaded, $"{_magState}-unshaded-{_magSteps-1}"); + sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false); + } + } + + public override void OnChangeData(AppearanceComponent component) + { + // tl;dr + // 1.If no mag then hide it OR + // 2. If step 0 isn't visible then hide it (mag or unshaded) + // 3. Otherwise just do mag / unshaded as is + var sprite = component.Owner.GetComponent(); + + component.TryGetData(MagazineBarrelVisuals.MagLoaded, out _magLoaded); + + if (_magLoaded) + { + if (!component.TryGetData(AmmoVisuals.AmmoMax, out int capacity)) + { + return; + } + if (!component.TryGetData(AmmoVisuals.AmmoCount, out int current)) + { + return; + } + + var step = ContentHelpers.RoundToLevels(current, capacity, _magSteps); + + if (step == 0 && !_zeroVisible) + { + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _)) + { + sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false); + } + + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) + { + sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false); + } + + return; + } + + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _)) + { + sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, true); + sprite.LayerSetState(RangedBarrelVisualLayers.Mag, $"{_magState}-{step}"); + } + + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) + { + sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, true); + sprite.LayerSetState(RangedBarrelVisualLayers.MagUnshaded, $"{_magState}-unshaded-{step}"); + } + } + else + { + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _)) + { + sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false); + } + + if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) + { + sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false); + } + } + } + } +} \ No newline at end of file diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer2D.cs new file mode 100644 index 0000000000..329f085660 --- /dev/null +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer2D.cs @@ -0,0 +1,29 @@ +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.Interfaces.GameObjects.Components; + +namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers +{ + [UsedImplicitly] + public sealed class SpentAmmoVisualizer2D : AppearanceVisualizer + { + public override void OnChangeData(AppearanceComponent component) + { + base.OnChangeData(component); + var sprite = component.Owner.GetComponent(); + + if (!component.TryGetData(AmmoVisuals.Spent, out bool spent)) + { + return; + } + + sprite.LayerSetState(AmmoVisualLayers.Base, spent ? "spent" : "base"); + } + } + + public enum AmmoVisualLayers + { + Base, + } +} \ No newline at end of file diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs index 8ef2f8185c..e37f6360b6 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs @@ -4,12 +4,35 @@ using Robust.Shared.Map; namespace Content.Client.GameObjects.Components.Weapons.Ranged { + // Yeah I put it all in the same enum, don't judge me + public enum RangedBarrelVisualLayers + { + Base, + BaseUnshaded, + Bolt, + Mag, + MagUnshaded, + } + [RegisterComponent] public sealed class ClientRangedWeaponComponent : SharedRangedWeaponComponent { + public FireRateSelector FireRateSelector { get; private set; } = FireRateSelector.Safety; + + public override void HandleComponentState(ComponentState curState, ComponentState nextState) + { + base.HandleComponentState(curState, nextState); + if (!(curState is RangedWeaponComponentState rangedState)) + { + return; + } + + FireRateSelector = rangedState.FireRateSelector; + } + public void SyncFirePos(GridCoordinates worldPos) { - SendNetworkMessage(new SyncFirePosMessage(worldPos)); + SendNetworkMessage(new FirePosComponentMessage(worldPos)); } } -} +} \ No newline at end of file diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/HitscanWeaponVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/HitscanWeaponVisualizer2D.cs deleted file mode 100644 index ce80b05a89..0000000000 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/HitscanWeaponVisualizer2D.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Content.Shared.GameObjects.Components.Power; -using Content.Shared.Utility; -using Robust.Client.GameObjects; -using Robust.Client.Interfaces.GameObjects.Components; -using Robust.Shared.Utility; -using YamlDotNet.RepresentationModel; - -namespace Content.Client.GameObjects.Components.Power -{ - public class HitscanWeaponVisualizer2D : AppearanceVisualizer - { - private string _prefix; - - public override void LoadData(YamlMappingNode node) - { - base.LoadData(node); - - _prefix = node.GetNode("prefix").AsString(); - } - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - - var sprite = component.Owner.GetComponent(); - if (component.TryGetData(PowerCellVisuals.ChargeLevel, out float fraction)) - { - sprite.LayerSetState(0, $"{_prefix}_{ContentHelpers.RoundToLevels(fraction, 1, 5) * 25}"); - } - } - } -} diff --git a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs index dcd874bd84..21f61e1606 100644 --- a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs +++ b/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs @@ -1,5 +1,7 @@ -using Content.Client.GameObjects.Components.Weapons.Ranged; +using System; +using Content.Client.GameObjects.Components.Weapons.Ranged; using Content.Client.Interfaces.GameObjects; +using Content.Shared.GameObjects.Components.Weapons.Ranged; using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Input; @@ -26,8 +28,8 @@ namespace Content.Client.GameObjects.EntitySystems private InputSystem _inputSystem; private CombatModeSystem _combatModeSystem; - private bool _isFirstShot; private bool _blocked; + private int _shotCounter; public override void Initialize() { @@ -46,18 +48,15 @@ namespace Content.Client.GameObjects.EntitySystems { return; } - - var canFireSemi = _isFirstShot; + var state = _inputSystem.CmdStates.GetState(EngineKeyFunctions.Use); if (!_combatModeSystem.IsInCombatMode() || state != BoundKeyState.Down) { - _isFirstShot = true; + _shotCounter = 0; _blocked = false; return; } - _isFirstShot = false; - var entity = _playerManager.LocalPlayer.ControlledEntity; if (entity == null || !entity.TryGetComponent(out IHandsComponent hands)) { @@ -71,6 +70,25 @@ namespace Content.Client.GameObjects.EntitySystems return; } + switch (weapon.FireRateSelector) + { + case FireRateSelector.Safety: + _blocked = true; + return; + case FireRateSelector.Single: + if (_shotCounter >= 1) + { + _blocked = true; + return; + } + + break; + case FireRateSelector.Automatic: + break; + default: + throw new ArgumentOutOfRangeException(); + } + if (_blocked) { return; @@ -81,10 +99,7 @@ namespace Content.Client.GameObjects.EntitySystems if (!_mapManager.TryFindGridAt(worldPos, out var grid)) grid = _mapManager.GetDefaultGrid(worldPos.MapId); - if (weapon.Automatic || canFireSemi) - { - weapon.SyncFirePos(grid.MapToGrid(worldPos)); - } + weapon.SyncFirePos(grid.MapToGrid(worldPos)); } } } diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/ClientGameTicker.cs index 1d3d278a67..a80f606215 100644 --- a/Content.Client/GameTicking/ClientGameTicker.cs +++ b/Content.Client/GameTicking/ClientGameTicker.cs @@ -24,6 +24,7 @@ namespace Content.Client.GameTicking [ViewVariables] public bool IsGameStarted { get; private set; } [ViewVariables] public string ServerInfoBlob { get; private set; } [ViewVariables] public DateTime StartTime { get; private set; } + [ViewVariables] public bool Paused { get; private set; } public event Action InfoBlobUpdated; public event Action LobbyStatusUpdated; @@ -36,6 +37,7 @@ namespace Content.Client.GameTicking _netManager.RegisterNetMessage(nameof(MsgTickerJoinGame), JoinGame); _netManager.RegisterNetMessage(nameof(MsgTickerLobbyStatus), LobbyStatus); _netManager.RegisterNetMessage(nameof(MsgTickerLobbyInfo), LobbyInfo); + _netManager.RegisterNetMessage(nameof(MsgTickerLobbyCountdown), LobbyCountdown); _netManager.RegisterNetMessage(nameof(MsgRoundEndMessage), RoundEnd); _initialized = true; @@ -53,6 +55,7 @@ namespace Content.Client.GameTicking StartTime = message.StartTime; IsGameStarted = message.IsRoundStarted; AreWeReady = message.YouAreReady; + Paused = message.Paused; LobbyStatusUpdated?.Invoke(); } @@ -69,6 +72,12 @@ namespace Content.Client.GameTicking _stateManager.RequestStateChange(); } + private void LobbyCountdown(MsgTickerLobbyCountdown message) + { + StartTime = message.StartTime; + Paused = message.Paused; + } + private void RoundEnd(MsgRoundEndMessage message) { diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 279b238217..f9636dc01f 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -39,7 +39,7 @@ namespace Content.Client.Input ghost.AddFunction(EngineKeyFunctions.MoveDown); ghost.AddFunction(EngineKeyFunctions.MoveLeft); ghost.AddFunction(EngineKeyFunctions.MoveRight); - ghost.AddFunction(EngineKeyFunctions.Run); + ghost.AddFunction(EngineKeyFunctions.Walk); ghost.AddFunction(ContentKeyFunctions.OpenContextMenu); common.AddFunction(ContentKeyFunctions.OpenEntitySpawnWindow); diff --git a/Content.Client/Interfaces/IClientGameTicker.cs b/Content.Client/Interfaces/IClientGameTicker.cs index 5e92e3d27c..8d47a0e1dc 100644 --- a/Content.Client/Interfaces/IClientGameTicker.cs +++ b/Content.Client/Interfaces/IClientGameTicker.cs @@ -8,6 +8,7 @@ namespace Content.Client.Interfaces string ServerInfoBlob { get; } bool AreWeReady { get; } DateTime StartTime { get; } + bool Paused { get; } void Initialize(); event Action InfoBlobUpdated; diff --git a/Content.Client/State/GameScreenBase.cs b/Content.Client/State/GameScreenBase.cs index b48bf750f3..b11201eca3 100644 --- a/Content.Client/State/GameScreenBase.cs +++ b/Content.Client/State/GameScreenBase.cs @@ -12,6 +12,7 @@ using Robust.Client.Interfaces.UserInterface; using Robust.Client.Player; using Robust.Shared.GameObjects; using Robust.Shared.Input; +using Robust.Shared.Interfaces.Configuration; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Timing; @@ -36,6 +37,8 @@ namespace Content.Client.State [Dependency] private readonly IGameTiming _timing; [Dependency] private readonly IMapManager _mapManager; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager; + + [Dependency] private readonly IConfigurationManager _configurationManager; #pragma warning restore 649 private IEntity _lastHoveredEntity; @@ -72,6 +75,15 @@ namespace Content.Client.State } InteractionOutlineComponent outline; + if(!_configurationManager.GetCVar("outline.enabled")) + { + if(entityToClick != null && entityToClick.TryGetComponent(out outline)) + { + outline.OnMouseLeave(); //Prevent outline remains from persisting post command. + } + return; + } + if (entityToClick == _lastHoveredEntity) { if (entityToClick != null && entityToClick.TryGetComponent(out outline)) diff --git a/Content.Client/State/LobbyState.cs b/Content.Client/State/LobbyState.cs index 2fd25666df..3209e1d01b 100644 --- a/Content.Client/State/LobbyState.cs +++ b/Content.Client/State/LobbyState.cs @@ -123,21 +123,29 @@ namespace Content.Client.State } string text; - var difference = _clientGameTicker.StartTime - DateTime.UtcNow; - if (difference.Ticks < 0) + + if (_clientGameTicker.Paused) { - if (difference.TotalSeconds < -5) - { - text = Loc.GetString("Right Now?"); - } - else - { - text = Loc.GetString("Right Now"); - } + text = Loc.GetString("Paused"); } else { - text = $"{(int) Math.Floor(difference.TotalMinutes)}:{difference.Seconds:D2}"; + var difference = _clientGameTicker.StartTime - DateTime.UtcNow; + if (difference.Ticks < 0) + { + if (difference.TotalSeconds < -5) + { + text = Loc.GetString("Right Now?"); + } + else + { + text = Loc.GetString("Right Now"); + } + } + else + { + text = $"{(int) Math.Floor(difference.TotalMinutes)}:{difference.Seconds:D2}"; + } } _lobby.StartTime.Text = Loc.GetString("Round Starts In: {0}", text); diff --git a/Content.IntegrationTests/DummyGameTicker.cs b/Content.IntegrationTests/DummyGameTicker.cs index 1f944841ab..5a5b5e6425 100644 --- a/Content.IntegrationTests/DummyGameTicker.cs +++ b/Content.IntegrationTests/DummyGameTicker.cs @@ -37,7 +37,7 @@ namespace Content.IntegrationTests { } - public void StartRound() + public void StartRound(bool force = false) { } @@ -81,12 +81,33 @@ namespace Content.IntegrationTests public IEnumerable ActiveGameRules { get; } = Array.Empty(); - public void SetStartPreset(Type type) + public bool TryGetPreset(string name, out Type type) + { + type = default; + return false; + } + + public void SetStartPreset(Type type, bool force = false) { } - public void SetStartPreset(string type) + public void SetStartPreset(string name, bool force = false) { } + + public bool DelayStart(TimeSpan time) + { + return true; + } + + public bool PauseStart(bool pause = true) + { + return true; + } + + public bool TogglePause() + { + return false; + } } } diff --git a/Content.Server/AI/Operators/AiOperator.cs b/Content.Server/AI/Operators/AiOperator.cs index 1989846ea9..94c809eabd 100644 --- a/Content.Server/AI/Operators/AiOperator.cs +++ b/Content.Server/AI/Operators/AiOperator.cs @@ -5,6 +5,7 @@ namespace Content.Server.AI.Operators { public abstract class AiOperator { + public bool HasStartup => _hasStartup; private bool _hasStartup = false; private bool _hasShutdown = false; diff --git a/Content.Server/AI/Operators/Combat/Ranged/ShootAtEntityOperator.cs b/Content.Server/AI/Operators/Combat/Ranged/ShootAtEntityOperator.cs deleted file mode 100644 index 4756843192..0000000000 --- a/Content.Server/AI/Operators/Combat/Ranged/ShootAtEntityOperator.cs +++ /dev/null @@ -1,100 +0,0 @@ -using Content.Server.GameObjects; -using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.GameObjects.Components.Weapon.Ranged; -using Robust.Shared.Interfaces.GameObjects; - - -namespace Content.Server.AI.Operators.Combat.Ranged -{ - public class ShootAtEntityOperator : AiOperator - { - private IEntity _owner; - private IEntity _target; - private float _accuracy; - - private float _burstTime; - - private float _elapsedTime; - - public ShootAtEntityOperator(IEntity owner, IEntity target, float accuracy, float burstTime = 0.5f) - { - _owner = owner; - _target = target; - _accuracy = accuracy; - _burstTime = burstTime; - } - - public override bool TryStartup() - { - if (!base.TryStartup()) - { - return true; - } - - if (!_owner.TryGetComponent(out CombatModeComponent combatModeComponent)) - { - return false; - } - - if (!combatModeComponent.IsInCombatMode) - { - combatModeComponent.IsInCombatMode = true; - } - - return true; - } - - public override void Shutdown(Outcome outcome) - { - base.Shutdown(outcome); - if (_owner.TryGetComponent(out CombatModeComponent combatModeComponent)) - { - combatModeComponent.IsInCombatMode = false; - } - } - - public override Outcome Execute(float frameTime) - { - // TODO: Probably just do all the checks on first try and then after that repeat the fire. - if (_burstTime <= _elapsedTime) - { - return Outcome.Success; - } - - _elapsedTime += frameTime; - - if (_target.TryGetComponent(out DamageableComponent damageableComponent)) - { - if (damageableComponent.IsDead()) - { - return Outcome.Success; - } - } - - if (!_owner.TryGetComponent(out HandsComponent hands) || hands.GetActiveHand == null) - { - return Outcome.Failed; - } - - var equippedWeapon = hands.GetActiveHand.Owner; - - if ((_target.Transform.GridPosition.Position - _owner.Transform.GridPosition.Position).Length > - _owner.GetComponent().VisionRadius) - { - // Not necessarily a hard fail, more of a soft fail - return Outcome.Failed; - } - - // Unless RangedWeaponComponent is removed from hitscan weapons this shouldn't happen - if (!equippedWeapon.TryGetComponent(out RangedWeaponComponent rangedWeaponComponent)) - { - return Outcome.Failed; - } - - // TODO: Accuracy - rangedWeaponComponent.AiFire(_owner, _target.Transform.GridPosition); - return Outcome.Continuing; - } - } -} diff --git a/Content.Server/AI/Operators/Combat/Ranged/WaitForHitscanChargeOperator.cs b/Content.Server/AI/Operators/Combat/Ranged/WaitForHitscanChargeOperator.cs deleted file mode 100644 index fc8835f118..0000000000 --- a/Content.Server/AI/Operators/Combat/Ranged/WaitForHitscanChargeOperator.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Operators.Combat.Ranged -{ - public class WaitForHitscanChargeOperator : AiOperator - { - private float _lastCharge = 0.0f; - private float _lastFill = 0.0f; - private HitscanWeaponComponent _hitscan; - - public WaitForHitscanChargeOperator(IEntity entity) - { - if (!entity.TryGetComponent(out HitscanWeaponComponent hitscanWeaponComponent)) - { - throw new InvalidOperationException(); - } - - _hitscan = hitscanWeaponComponent; - } - - public override Outcome Execute(float frameTime) - { - if (_hitscan.CapacitorComponent.Capacity - _hitscan.CapacitorComponent.Charge < 0.01f) - { - return Outcome.Success; - } - - // If we're not charging then just stop - _lastFill = _hitscan.CapacitorComponent.Charge - _lastCharge; - _lastCharge = _hitscan.CapacitorComponent.Charge; - - if (_lastFill == 0.0f) - { - return Outcome.Failed; - } - return Outcome.Continuing; - } - } -} diff --git a/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs b/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs index 759c2c28b2..e65dc890cf 100644 --- a/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs +++ b/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs @@ -21,7 +21,7 @@ namespace Content.Server.AI.Operators.Inventory /// public override Outcome Execute(float frameTime) { - if (!_owner.TryGetComponent(out HandsComponent handsComponent)) + if (!_owner.TryGetComponent(out HandsComponent handsComponent) || handsComponent.FindHand(_entity) == null) { return Outcome.Failed; } diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs index fe2f5e24e1..c7c21ae3f2 100644 --- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs +++ b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs @@ -3,6 +3,7 @@ using Content.Server.AI.WorldState.States.Inventory; using Content.Server.GameObjects.Components; using Content.Server.GameObjects.EntitySystems; using Content.Server.Utility; +using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.Containers; using Robust.Shared.Interfaces.GameObjects; @@ -24,15 +25,15 @@ namespace Content.Server.AI.Operators.Inventory public override Outcome Execute(float frameTime) { - if (!InteractionChecks.InRangeUnobstructed(_owner, _target.Transform.MapPosition)) - { - return Outcome.Failed; - } - if (!ContainerHelpers.TryGetContainer(_target, out var container)) { return Outcome.Success; } + + if (!InteractionChecks.InRangeUnobstructed(_owner, container.Owner.Transform.MapPosition, ignoredEnt: container.Owner)) + { + return Outcome.Failed; + } if (!container.Owner.TryGetComponent(out EntityStorageComponent storageComponent) || storageComponent.IsWeldedShut) diff --git a/Content.Server/AI/Operators/Movement/BaseMover.cs b/Content.Server/AI/Operators/Movement/BaseMover.cs index 16f225215b..a491de14fb 100644 --- a/Content.Server/AI/Operators/Movement/BaseMover.cs +++ b/Content.Server/AI/Operators/Movement/BaseMover.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading; +using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.Components.Movement; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; @@ -240,10 +241,11 @@ namespace Content.Server.AI.Operators.Movement var startGrid = _mapManager.GetGrid(Owner.Transform.GridID).GetTileRef(Owner.Transform.GridPosition); var endGrid = _mapManager.GetGrid(TargetGrid.GridID).GetTileRef(TargetGrid);; - // _routeCancelToken = new CancellationTokenSource(); + var access = AccessReader.FindAccessTags(Owner); RouteJob = _pathfinder.RequestPath(new PathfindingArgs( Owner.Uid, + access, collisionMask, startGrid, endGrid, diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs index 0fdb5e02a2..81c799701c 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/EquipMelee.cs @@ -3,7 +3,6 @@ using Content.Server.AI.Operators; using Content.Server.AI.Operators.Inventory; using Content.Server.AI.Utility.Considerations; using Content.Server.AI.Utility.Considerations.Combat.Melee; -using Content.Server.AI.Utility.Considerations.Combat.Ranged; using Content.Server.AI.Utility.Considerations.Inventory; using Content.Server.AI.Utility.Curves; using Content.Server.AI.WorldState; @@ -41,9 +40,6 @@ namespace Content.Server.AI.Utility.Actions.Combat.Melee protected override Consideration[] Considerations { get; } = { new MeleeWeaponEquippedCon( new InverseBoolCurve()), - // We'll prioritise equipping ranged weapons; If we try and score this then it'll just keep swapping between ranged and melee - new RangedWeaponEquippedCon( - new InverseBoolCurve()), new CanPutTargetInHandsCon( new BoolCurve()), new MeleeWeaponSpeedCon( diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeAttackEntity.cs index 403ad6411a..25f329fdc1 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeAttackEntity.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeAttackEntity.cs @@ -29,11 +29,17 @@ namespace Content.Server.AI.Utility.Actions.Combat.Melee public override void SetupOperators(Blackboard context) { - var moveOperator = new MoveToEntityOperator(Owner, _entity); var equipped = context.GetState().GetValue(); + MoveToEntityOperator moveOperator; if (equipped != null && equipped.TryGetComponent(out MeleeWeaponComponent meleeWeaponComponent)) { - moveOperator.DesiredRange = meleeWeaponComponent.Range - 0.01f; + moveOperator = new MoveToEntityOperator(Owner, _entity, meleeWeaponComponent.Range - 0.01f); + } + // I think it's possible for this to happen given planning is time-sliced? + // TODO: At this point we should abort + else + { + moveOperator = new MoveToEntityOperator(Owner, _entity); } ActionOperators = new Queue(new AiOperator[] @@ -64,7 +70,7 @@ namespace Content.Server.AI.Utility.Actions.Combat.Melee new QuadraticCurve(-0.8f, 1.0f, 1.0f, 0.0f)), // Somewhat prioritise distance new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), + new QuadraticCurve(-1.0f, 1.0f, 1.02f, 0.0f)), // Prefer weaker targets new TargetHealthCon( new QuadraticCurve(1.0f, 0.4f, 0.0f, -0.02f)), diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs index ae4e8da589..216152e4d8 100644 --- a/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs +++ b/Content.Server/AI/Utility/Actions/Combat/Melee/PickUpMeleeWeapon.cs @@ -42,7 +42,7 @@ namespace Content.Server.AI.Utility.Actions.Combat.Melee new HasMeleeWeaponCon( new InverseBoolCurve()), new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), + new QuadraticCurve(-1.0f, 1.0f, 1.02f, 0.0f)), new MeleeWeaponDamageCon( new QuadraticCurve(1.0f, 0.25f, 0.0f, 0.0f)), new MeleeWeaponSpeedCon( diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/BallisticAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/BallisticAttackEntity.cs deleted file mode 100644 index a899644074..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/BallisticAttackEntity.cs +++ /dev/null @@ -1,97 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Combat.Ranged; -using Content.Server.AI.Operators.Movement; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Ballistic; -using Content.Server.AI.Utility.Considerations.Movement; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.Utils; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Combat; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.AI.WorldState.States.Movement; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic -{ - public sealed class BallisticAttackEntity : UtilityAction - { - private IEntity _entity; - private MoveToEntityOperator _moveOperator; - - public BallisticAttackEntity(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void Shutdown() - { - base.Shutdown(); - if (_moveOperator != null) - { - _moveOperator.MovedATile -= InLos; - } - } - - public override void SetupOperators(Blackboard context) - { - _moveOperator = new MoveToEntityOperator(Owner, _entity); - _moveOperator.MovedATile += InLos; - - // TODO: Accuracy in blackboard - ActionOperators = new Queue(new AiOperator[] - { - _moveOperator, - new ShootAtEntityOperator(Owner, _entity, 0.7f), - }); - - // We will do a quick check now to see if we even need to move which also saves a pathfind - InLos(); - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - var equipped = context.GetState().GetValue(); - context.GetState().SetValue(equipped); - } - - protected override Consideration[] Considerations { get; } = { - // Check if we have a weapon; easy-out - new BallisticWeaponEquippedCon( - new BoolCurve()), - new BallisticAmmoCon( - new QuadraticCurve(1.0f, 0.15f, 0.0f, 0.0f)), - // Don't attack a dead target - new TargetIsDeadCon( - new InverseBoolCurve()), - // Deprioritise a target in crit - new TargetIsCritCon( - new QuadraticCurve(-0.8f, 1.0f, 1.0f, 0.0f)), - // Somewhat prioritise distance - new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.07f, 0.0f)), - // Prefer weaker targets - new TargetHealthCon( - new QuadraticCurve(1.0f, 0.4f, 0.0f, -0.02f)), - }; - - private void InLos() - { - // This should only be called if the movement operator is the current one; - // if that turns out not to be the case we can just add a check here. - if (Visibility.InLineOfSight(Owner, _entity)) - { - _moveOperator.HaveArrived(); - var mover = ActionOperators.Dequeue(); - mover.Shutdown(Outcome.Success); - } - } - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/DropEmptyBallistic.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/DropEmptyBallistic.cs deleted file mode 100644 index 15de797219..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/DropEmptyBallistic.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Inventory; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Ballistic; -using Content.Server.AI.Utility.Considerations.Inventory; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Combat; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic -{ - public sealed class DropEmptyBallistic : UtilityAction - { - public sealed override float Bonus => 20.0f; - private IEntity _entity; - - public DropEmptyBallistic(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - ActionOperators = new Queue(new AiOperator[] - { - new EquipEntityOperator(Owner, _entity), - new DropEntityOperator(Owner, _entity) - }); - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - } - - protected override Consideration[] Considerations { get; } = { - new TargetInOurInventoryCon( - new BoolCurve()), - // Need to put in hands to drop - new CanPutTargetInHandsCon( - new BoolCurve()), - // Drop that sucker - new BallisticAmmoCon( - new InverseBoolCurve()), - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/EquipBallistic.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/EquipBallistic.cs deleted file mode 100644 index 3c3ec8d84c..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/EquipBallistic.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Inventory; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat.Melee; -using Content.Server.AI.Utility.Considerations.Combat.Ranged; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Ballistic; -using Content.Server.AI.Utility.Considerations.Inventory; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Combat; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic -{ - public sealed class EquipBallistic : UtilityAction - { - private IEntity _entity; - - public EquipBallistic(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - ActionOperators = new Queue(new AiOperator[] - { - new EquipEntityOperator(Owner, _entity) - }); - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - } - - protected override Consideration[] Considerations { get; } = { - new EquippedBallisticCon( - new InverseBoolCurve()), - new MeleeWeaponEquippedCon( - new QuadraticCurve(0.9f, 1.0f, 0.1f, 0.0f)), - new CanPutTargetInHandsCon( - new BoolCurve()), - new BallisticAmmoCon( - new QuadraticCurve(1.0f, 0.15f, 0.0f, 0.0f)), - new RangedWeaponFireRateCon( - new QuadraticCurve(1.0f, 0.5f, 0.0f, 0.0f)), - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/PickUpAmmo.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/PickUpAmmo.cs deleted file mode 100644 index cf897a19f9..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/PickUpAmmo.cs +++ /dev/null @@ -1,46 +0,0 @@ -using Content.Server.AI.Operators.Sequences; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Containers; -using Content.Server.AI.Utility.Considerations.Hands; -using Content.Server.AI.Utility.Considerations.Movement; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Movement; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic -{ - public sealed class PickUpAmmo : UtilityAction - { - private IEntity _entity; - - public PickUpAmmo(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - ActionOperators = new GoPickupEntitySequence(Owner, _entity).Sequence; - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - } - - protected override Consideration[] Considerations { get; } = { - //TODO: Consider ammo's type and what guns we have - new TargetAccessibleCon( - new BoolCurve()), - new FreeHandCon( - new BoolCurve()), - new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/PickUpBallisticMagWeapon.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/PickUpBallisticMagWeapon.cs deleted file mode 100644 index ef1934565a..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Ballistic/PickUpBallisticMagWeapon.cs +++ /dev/null @@ -1,57 +0,0 @@ -using Content.Server.AI.Operators.Sequences; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat.Ranged; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Ballistic; -using Content.Server.AI.Utility.Considerations.Containers; -using Content.Server.AI.Utility.Considerations.Hands; -using Content.Server.AI.Utility.Considerations.Movement; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Combat; -using Content.Server.AI.WorldState.States.Movement; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic -{ - public sealed class PickUpBallisticMagWeapon : UtilityAction - { - private IEntity _entity; - - public PickUpBallisticMagWeapon(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - ActionOperators = new GoPickupEntitySequence(Owner, _entity).Sequence; - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - } - - protected override Consideration[] Considerations { get; } = { - new HeldRangedWeaponsCon( - new QuadraticCurve(-1.0f, 1.0f, 1.0f, 0.0f)), - new TargetAccessibleCon( - new BoolCurve()), - new FreeHandCon( - new BoolCurve()), - // For now don't grab empty guns - at least until we can start storing stuff in inventory - new BallisticAmmoCon( - new BoolCurve()), - new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), - new RangedWeaponFireRateCon( - new QuadraticCurve(1.0f, 0.5f, 0.0f, 0.0f)), - // TODO: Ballistic accuracy? Depends how the design transitions - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/ChargeHitscan.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/ChargeHitscan.cs deleted file mode 100644 index b8b6143dc6..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/ChargeHitscan.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Inventory; -using Content.Server.AI.Operators.Movement; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan; -using Content.Server.AI.Utility.Considerations.Movement; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.AI.WorldState.States.Movement; -using Content.Server.GameObjects.Components.Power.Chargers; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan -{ - public sealed class PutHitscanInCharger : UtilityAction - { - // Maybe a bad idea to not allow override - public override bool CanOverride => false; - private readonly IEntity _charger; - - public PutHitscanInCharger(IEntity owner, IEntity charger, float weight) : base(owner) - { - _charger = charger; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - var weapon = context.GetState().GetValue(); - - if (weapon == null || _charger.GetComponent().HeldItem != null) - { - ActionOperators = new Queue(); - return; - } - - ActionOperators = new Queue(new AiOperator[] - { - new MoveToEntityOperator(Owner, _charger), - new InteractWithEntityOperator(Owner, _charger), - // Separate task will deal with picking it up - }); - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_charger); - context.GetState().SetValue(_charger); - } - - protected override Consideration[] Considerations { get; } = - { - new HitscanWeaponEquippedCon( - new BoolCurve()), - new HitscanChargerFullCon( - new InverseBoolCurve()), - new HitscanChargerRateCon( - new QuadraticCurve(1.0f, 0.5f, 0.0f, 0.0f)), - new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), - new HitscanChargeCon( - new QuadraticCurve(-1.2f, 2.0f, 1.2f, 0.0f)), - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/DropEmptyHitscan.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/DropEmptyHitscan.cs deleted file mode 100644 index f56bde67e8..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/DropEmptyHitscan.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Inventory; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan; -using Content.Server.AI.Utility.Considerations.Inventory; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Combat; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan -{ - public sealed class DropEmptyHitscan : UtilityAction - { - private IEntity _entity; - - public DropEmptyHitscan(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - ActionOperators = new Queue(new AiOperator[] - { - new EquipEntityOperator(Owner, _entity), - new DropEntityOperator(Owner, _entity) - }); - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - } - - protected override Consideration[] Considerations { get; } = { - new TargetInOurInventoryCon( - new BoolCurve()), - // Need to put in hands to drop - new CanPutTargetInHandsCon( - new BoolCurve()), - // If completely empty then drop that sucker - new HitscanChargeCon( - new InverseBoolCurve()), - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/EquipHitscan.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/EquipHitscan.cs deleted file mode 100644 index becf2a9e0b..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/EquipHitscan.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Inventory; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat.Melee; -using Content.Server.AI.Utility.Considerations.Combat.Ranged; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan; -using Content.Server.AI.Utility.Considerations.Inventory; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Combat; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan -{ - public sealed class EquipHitscan : UtilityAction - { - private IEntity _entity; - - public EquipHitscan(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - ActionOperators = new Queue(new AiOperator[] - { - new EquipEntityOperator(Owner, _entity) - }); - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - } - - protected override Consideration[] Considerations { get; } = { - new EquippedHitscanCon( - new InverseBoolCurve()), - new MeleeWeaponEquippedCon( - new QuadraticCurve(0.9f, 1.0f, 0.1f, 0.0f)), - new CanPutTargetInHandsCon( - new BoolCurve()), - new HitscanChargeCon( - new QuadraticCurve(1.0f, 1.0f, 0.0f, 0.0f)), - new RangedWeaponFireRateCon( - new QuadraticCurve(1.0f, 0.5f, 0.0f, 0.0f)), - new HitscanWeaponDamageCon( - new QuadraticCurve(1.0f, 0.25f, 0.0f, 0.0f)), - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/HitscanAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/HitscanAttackEntity.cs deleted file mode 100644 index b79e4615db..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/HitscanAttackEntity.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Combat.Ranged; -using Content.Server.AI.Operators.Movement; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan; -using Content.Server.AI.Utility.Considerations.Movement; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.Utils; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Combat; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.AI.WorldState.States.Movement; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan -{ - public sealed class HitscanAttackEntity : UtilityAction - { - private IEntity _entity; - private MoveToEntityOperator _moveOperator; - - public HitscanAttackEntity(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void Shutdown() - { - base.Shutdown(); - if (_moveOperator != null) - { - _moveOperator.MovedATile -= InLos; - } - } - - public override void SetupOperators(Blackboard context) - { - _moveOperator = new MoveToEntityOperator(Owner, _entity); - _moveOperator.MovedATile += InLos; - - // TODO: Accuracy in blackboard - ActionOperators = new Queue(new AiOperator[] - { - _moveOperator, - new ShootAtEntityOperator(Owner, _entity, 0.7f), - }); - - InLos(); - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - var equipped = context.GetState().GetValue(); - context.GetState().SetValue(equipped); - } - - protected override Consideration[] Considerations { get; } = { - // Check if we have a weapon; easy-out - new HitscanWeaponEquippedCon( - new BoolCurve()), - new HitscanChargeCon( - new QuadraticCurve(1.0f, 0.1f, 0.0f, 0.0f)), - // Don't attack a dead target - new TargetIsDeadCon( - new InverseBoolCurve()), - // Deprioritise a target in crit - new TargetIsCritCon( - new QuadraticCurve(-0.8f, 1.0f, 1.0f, 0.0f)), - // Somewhat prioritise distance - new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.07f, 0.0f)), - // Prefer weaker targets - new TargetHealthCon( - new QuadraticCurve(1.0f, 0.4f, 0.0f, -0.02f)), - }; - - private void InLos() - { - // This should only be called if the movement operator is the current one; - // if that turns out not to be the case we can just add a check here. - if (Visibility.InLineOfSight(Owner, _entity)) - { - _moveOperator.HaveArrived(); - var mover = ActionOperators.Dequeue(); - mover.Shutdown(Outcome.Success); - } - } - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/PickUpHitscanFromCharger.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/PickUpHitscanFromCharger.cs deleted file mode 100644 index 7bd1fd48f1..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/PickUpHitscanFromCharger.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Operators; -using Content.Server.AI.Operators.Combat.Ranged; -using Content.Server.AI.Operators.Inventory; -using Content.Server.AI.Operators.Movement; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat.Ranged; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan; -using Content.Server.AI.Utility.Considerations.Containers; -using Content.Server.AI.Utility.Considerations.Hands; -using Content.Server.AI.Utility.Considerations.Movement; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Movement; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan -{ - public sealed class PickUpHitscanFromCharger : UtilityAction - { - private IEntity _entity; - private IEntity _charger; - - public PickUpHitscanFromCharger(IEntity owner, IEntity entity, IEntity charger, float weight) : base(owner) - { - _entity = entity; - _charger = charger; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - ActionOperators = new Queue(new AiOperator[] - { - new MoveToEntityOperator(Owner, _charger), - new WaitForHitscanChargeOperator(_entity), - new PickupEntityOperator(Owner, _entity), - }); - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - } - - protected override Consideration[] Considerations { get; } = { - new HeldRangedWeaponsCon( - new QuadraticCurve(-1.0f, 1.0f, 1.0f, 0.0f)), - new TargetAccessibleCon( - new BoolCurve()), - new FreeHandCon( - new BoolCurve()), - new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), - // TODO: ChargerHasPower - new RangedWeaponFireRateCon( - new QuadraticCurve(1.0f, 0.5f, 0.0f, 0.0f)), - new HitscanWeaponDamageCon( - new QuadraticCurve(1.0f, 0.25f, 0.0f, 0.0f)), - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/PickUpHitscanWeapon.cs b/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/PickUpHitscanWeapon.cs deleted file mode 100644 index 463de4f0f9..0000000000 --- a/Content.Server/AI/Utility/Actions/Combat/Ranged/Hitscan/PickUpHitscanWeapon.cs +++ /dev/null @@ -1,59 +0,0 @@ -using Content.Server.AI.Operators.Sequences; -using Content.Server.AI.Utility.Considerations; -using Content.Server.AI.Utility.Considerations.Combat.Ranged; -using Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan; -using Content.Server.AI.Utility.Considerations.Containers; -using Content.Server.AI.Utility.Considerations.Hands; -using Content.Server.AI.Utility.Considerations.Movement; -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Combat; -using Content.Server.AI.WorldState.States.Movement; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan -{ - public sealed class PickUpHitscanWeapon : UtilityAction - { - private IEntity _entity; - - public PickUpHitscanWeapon(IEntity owner, IEntity entity, float weight) : base(owner) - { - _entity = entity; - Bonus = weight; - } - - public override void SetupOperators(Blackboard context) - { - ActionOperators = new GoPickupEntitySequence(Owner, _entity).Sequence; - } - - protected override void UpdateBlackboard(Blackboard context) - { - base.UpdateBlackboard(context); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - context.GetState().SetValue(_entity); - } - - protected override Consideration[] Considerations { get; } = { - new HeldRangedWeaponsCon( - new QuadraticCurve(-1.0f, 1.0f, 1.0f, 0.0f)), - new TargetAccessibleCon( - new BoolCurve()), - new FreeHandCon( - new BoolCurve()), - // For now don't grab empty guns - at least until we can start storing stuff in inventory - new HitscanChargeCon( - new BoolCurve()), - new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), - // TODO: Weapon charge level - new RangedWeaponFireRateCon( - new QuadraticCurve(1.0f, 0.5f, 0.0f, 0.0f)), - new HitscanWeaponDamageCon( - new QuadraticCurve(1.0f, 0.25f, 0.0f, 0.0f)), - }; - } -} diff --git a/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs b/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs index 1fd934cdc2..29b7e7b918 100644 --- a/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs +++ b/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs @@ -26,7 +26,7 @@ namespace Content.Server.AI.Utility.Actions.Idle new StoredStateIsNullCon( new InverseBoolCurve()), new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), + new QuadraticCurve(-1.0f, 1.0f, 1.02f, 0.0f)), }; public override void SetupOperators(Blackboard context) { diff --git a/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs b/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs index e9c181c5b7..c376641bb9 100644 --- a/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs +++ b/Content.Server/AI/Utility/Actions/Nutrition/Drink/PickUpDrink.cs @@ -35,7 +35,7 @@ namespace Content.Server.AI.Utility.Actions.Nutrition.Drink new ThirstCon( new LogisticCurve(1000f, 1.3f, -1.0f, 0.5f)), new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), + new QuadraticCurve(-1.0f, 1.0f, 1.02f, 0.0f)), new DrinkValueCon( new QuadraticCurve(1.0f, 0.4f, 0.0f, 0.0f)), }; diff --git a/Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs b/Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs index 9db0b814dd..cd12fab1c7 100644 --- a/Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs +++ b/Content.Server/AI/Utility/Actions/Nutrition/Food/PickUpFood.cs @@ -35,7 +35,7 @@ namespace Content.Server.AI.Utility.Actions.Nutrition.Food new HungerCon( new LogisticCurve(1000f, 1.3f, -1.0f, 0.5f)), new DistanceCon( - new QuadraticCurve(1.0f, 1.0f, 0.02f, 0.0f)), + new QuadraticCurve(-1.0f, 1.0f, 1.02f, 0.0f)), new FoodValueCon( new QuadraticCurve(1.0f, 0.4f, 0.0f, 0.0f)), }; diff --git a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs index 0b76293e8f..e886d0ff61 100644 --- a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs +++ b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs @@ -126,6 +126,9 @@ namespace Content.Server.AI.Utility.AiLogic { damageableComponent.DamageThresholdPassed -= DeathHandle; } + + var currentOp = CurrentAction?.ActionOperators.Peek(); + currentOp?.Shutdown(Outcome.Failed); } private void DeathHandle(object sender, DamageThresholdPassedEventArgs eventArgs) @@ -152,6 +155,12 @@ namespace Content.Server.AI.Utility.AiLogic { return; } + + var currentOp = CurrentAction?.ActionOperators.Peek(); + if (currentOp != null && currentOp.HasStartup) + { + currentOp.Shutdown(Outcome.Failed); + } CurrentAction = action; action.SetupOperators(_blackboard); diff --git a/Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs b/Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs index 4228c33517..0c6360a6dd 100644 --- a/Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs +++ b/Content.Server/AI/Utility/BehaviorSets/SpirateBehaviorSet.cs @@ -1,13 +1,5 @@ -using System.Collections.Generic; using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan; -using Content.Server.AI.Utility.ExpandableActions.Combat; using Content.Server.AI.Utility.ExpandableActions.Combat.Melee; -using Content.Server.AI.Utility.ExpandableActions.Combat.Ranged; -using Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Ballistic; -using Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan; using Robust.Shared.Interfaces.GameObjects; namespace Content.Server.AI.Utility.BehaviorSets @@ -18,19 +10,11 @@ namespace Content.Server.AI.Utility.BehaviorSets { Actions = new IAiUtility[] { - new PickUpRangedExp(), // TODO: Reload Ballistic - new DropEmptyBallisticExp(), // TODO: Ideally long-term we should just store the weapons in backpack - new DropEmptyHitscanExp(), new EquipMeleeExp(), - new EquipBallisticExp(), - new EquipHitscanExp(), - new PickUpHitscanFromChargersExp(), - new ChargeEquippedHitscanExp(), - new RangedAttackNearbySpeciesExp(), new PickUpMeleeWeaponExp(), - new MeleeAttackNearbySpeciesExp(), + new MeleeAttackNearbyPlayerExp(), }; } } diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/BallisticAmmoCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/BallisticAmmoCon.cs deleted file mode 100644 index faa740bad6..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/BallisticAmmoCon.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Combat; -using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Ballistic -{ - public class BallisticAmmoCon : Consideration - { - public BallisticAmmoCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var weapon = context.GetState().GetValue(); - - if (weapon == null || !weapon.TryGetComponent(out BallisticMagazineWeaponComponent ballistic)) - { - return 0.0f; - } - - var contained = ballistic.MagazineSlot.ContainedEntity; - - if (contained == null) - { - return 0.0f; - } - - var mag = contained.GetComponent(); - - if (mag.CountLoaded == 0) - { - // TODO: Do this better - return ballistic.GetChambered(0) != null ? 1.0f : 0.0f; - } - - return (float) mag.CountLoaded / mag.Capacity; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/BallisticWeaponEquippedCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/BallisticWeaponEquippedCon.cs deleted file mode 100644 index 9e7672feaf..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/BallisticWeaponEquippedCon.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Ballistic -{ - public class BallisticWeaponEquippedCon : Consideration - { - public BallisticWeaponEquippedCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var equipped = context.GetState().GetValue(); - - if (equipped == null) - { - return 0.0f; - } - - // Maybe change this to BallisticMagazineWeapon - return equipped.HasComponent() ? 1.0f : 0.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/EquippedBallisticCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/EquippedBallisticCon.cs deleted file mode 100644 index d2d289fd3f..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Ballistic/EquippedBallisticCon.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Ballistic -{ - public class EquippedBallisticCon : Consideration - { - public EquippedBallisticCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var equipped = context.GetState().GetValue(); - - if (equipped == null || !equipped.HasComponent()) - { - return 0.0f; - } - - return 1.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/HasTargetLosCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/HasTargetLosCon.cs deleted file mode 100644 index f27aa41256..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/HasTargetLosCon.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.Utils; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged -{ - public class HasTargetLosCon : Consideration - { - public HasTargetLosCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var owner = context.GetState().GetValue(); - var target = context.GetState().GetValue(); - if (target == null) - { - return 0.0f; - } - - return Visibility.InLineOfSight(owner, target) ? 1.0f : 0.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/HeldRangedWeaponsCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/HeldRangedWeaponsCon.cs deleted file mode 100644 index 949db84849..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/HeldRangedWeaponsCon.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components.Weapon.Melee; -using Content.Server.GameObjects.Components.Weapon.Ranged; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged -{ - public sealed class HeldRangedWeaponsCon : Consideration - { - public HeldRangedWeaponsCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var count = 0; - const int max = 3; - - foreach (var item in context.GetState().GetValue()) - { - if (item.HasComponent()) - { - count++; - } - } - - return (float) count / max; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/EquippedHitscanCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/EquippedHitscanCon.cs deleted file mode 100644 index ae5c0b7bf1..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/EquippedHitscanCon.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan -{ - public sealed class EquippedHitscanCon : Consideration - { - public EquippedHitscanCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var equipped = context.GetState().GetValue(); - - if (equipped == null || !equipped.HasComponent()) - { - return 0.0f; - } - - return 1.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargeCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargeCon.cs deleted file mode 100644 index 2e24b8c8ca..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargeCon.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Combat; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan -{ - public sealed class HitscanChargeCon : Consideration - { - public HitscanChargeCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var weapon = context.GetState().GetValue(); - - if (weapon == null || !weapon.TryGetComponent(out HitscanWeaponComponent hitscanWeaponComponent)) - { - return 0.0f; - } - - return hitscanWeaponComponent.CapacitorComponent.Charge / hitscanWeaponComponent.CapacitorComponent.Capacity; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargerFullCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargerFullCon.cs deleted file mode 100644 index eaad383287..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargerFullCon.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects.Components.Power.Chargers; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan -{ - public sealed class HitscanChargerFullCon : Consideration - { - public HitscanChargerFullCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var target = context.GetState().GetValue(); - - if (target == null || - !target.TryGetComponent(out WeaponCapacitorChargerComponent chargerComponent) || - chargerComponent.HeldItem != null) - { - return 1.0f; - } - - return 0.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargerRateCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargerRateCon.cs deleted file mode 100644 index 87eb9e332d..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanChargerRateCon.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects.Components.Power.Chargers; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan -{ - public sealed class HitscanChargerRateCon : Consideration - { - public HitscanChargerRateCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var target = context.GetState().GetValue(); - if (target == null || !target.TryGetComponent(out WeaponCapacitorChargerComponent weaponCharger)) - { - return 0.0f; - } - - // AI don't care about efficiency, psfft! - return weaponCharger.TransferRatio; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanWeaponDamageCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanWeaponDamageCon.cs deleted file mode 100644 index d3652a4da3..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanWeaponDamageCon.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Combat; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan -{ - public sealed class HitscanWeaponDamageCon : Consideration - { - public HitscanWeaponDamageCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var weapon = context.GetState().GetValue(); - - if (weapon == null || !weapon.TryGetComponent(out HitscanWeaponComponent hitscanWeaponComponent)) - { - return 0.0f; - } - - // Just went with max health - return hitscanWeaponComponent.Damage / 300.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanWeaponEquippedCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanWeaponEquippedCon.cs deleted file mode 100644 index fae397aa5e..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/Hitscan/HitscanWeaponEquippedCon.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged.Hitscan -{ - public sealed class HitscanWeaponEquippedCon : Consideration - { - public HitscanWeaponEquippedCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var equipped = context.GetState().GetValue(); - - if (equipped == null) - { - return 0.0f; - } - - return equipped.HasComponent() ? 1.0f : 0.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/RangedWeaponEquippedCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/RangedWeaponEquippedCon.cs deleted file mode 100644 index 52d2e48117..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/RangedWeaponEquippedCon.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components.Weapon.Ranged; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged -{ - public sealed class RangedWeaponEquippedCon : Consideration - { - public RangedWeaponEquippedCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var equipped = context.GetState().GetValue(); - - if (equipped == null || !equipped.HasComponent()) - { - return 0.0f; - } - - return 1.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Combat/Ranged/RangedWeaponFireRateCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Ranged/RangedWeaponFireRateCon.cs deleted file mode 100644 index a44e5a9552..0000000000 --- a/Content.Server/AI/Utility/Considerations/Combat/Ranged/RangedWeaponFireRateCon.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Server.AI.Utility.Curves; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States.Combat; -using Content.Server.GameObjects.Components.Weapon.Ranged; - -namespace Content.Server.AI.Utility.Considerations.Combat.Ranged -{ - public class RangedWeaponFireRateCon : Consideration - { - public RangedWeaponFireRateCon(IResponseCurve curve) : base(curve) {} - - public override float GetScore(Blackboard context) - { - var weapon = context.GetState().GetValue(); - - if (weapon == null || !weapon.TryGetComponent(out RangedWeaponComponent ranged)) - { - return 0.0f; - } - - return ranged.FireRate / 100.0f; - } - } -} diff --git a/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs b/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs index a9af493745..4265db6abd 100644 --- a/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs +++ b/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs @@ -31,6 +31,12 @@ namespace Content.Server.AI.Utility.Considerations.Containers return 0.0f; } } + else + { + // If we're in a container (e.g. held or whatever) then we probably can't get it. Only exception + // Is a locker / crate + return 0.0f; + } } return 1.0f; diff --git a/Content.Server/AI/Utility/Considerations/Movement/DistanceCon.cs b/Content.Server/AI/Utility/Considerations/Movement/DistanceCon.cs index 3ecb715c8a..b8dfee7354 100644 --- a/Content.Server/AI/Utility/Considerations/Movement/DistanceCon.cs +++ b/Content.Server/AI/Utility/Considerations/Movement/DistanceCon.cs @@ -16,10 +16,9 @@ namespace Content.Server.AI.Utility.Considerations.Movement { return 0.0f; } - - // TODO: Remove 1 - + // Kind of just pulled a max distance out of nowhere. Add 0.01 just in case it's reaally far and we have no choice so it'll still be considered at least. - return 1 - ((target.Transform.GridPosition.Position - self.Transform.GridPosition.Position).Length / 100 + 0.01f); + return (target.Transform.GridPosition.Position - self.Transform.GridPosition.Position).Length / 100 + 0.01f; } } } diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/DropEmptyBallisticExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/DropEmptyBallisticExp.cs deleted file mode 100644 index db3e281905..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/DropEmptyBallisticExp.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Ballistic -{ - public sealed class DropEmptyBallisticExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatPrepBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - - foreach (var entity in context.GetState().GetValue()) - { - if (entity.HasComponent()) - { - yield return new DropEmptyBallistic(owner, entity, Bonus); - } - } - } - } -} diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/EquipBallisticExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/EquipBallisticExp.cs deleted file mode 100644 index 16e98819d9..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/EquipBallisticExp.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Inventory; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Ballistic -{ - public sealed class EquipBallisticExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatPrepBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - - foreach (var entity in context.GetState().GetValue()) - { - yield return new EquipBallistic(owner, entity, Bonus); - } - } - } -} diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/PickUpAmmoExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/PickUpAmmoExp.cs deleted file mode 100644 index cc770a057d..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/PickUpAmmoExp.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic; -using Content.Server.AI.Utils; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Ballistic -{ - public sealed class PickUpAmmoExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatPrepBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - if (!owner.TryGetComponent(out AiControllerComponent controller)) - { - throw new InvalidOperationException(); - } - - foreach (var entity in Visibility.GetEntitiesInRange(owner.Transform.GridPosition, typeof(BallisticMagazineComponent), - controller.VisionRadius)) - { - yield return new PickUpAmmo(owner, entity, Bonus); - } - } - } -} diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/ChargeEquippedHitscanExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/ChargeEquippedHitscanExp.cs deleted file mode 100644 index b6d545d4a1..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/ChargeEquippedHitscanExp.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan; -using Content.Server.AI.Utils; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.GameObjects.Components.Power.Chargers; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan -{ - public sealed class ChargeEquippedHitscanExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatPrepBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - if (!owner.TryGetComponent(out AiControllerComponent controller)) - { - throw new InvalidOperationException(); - } - - foreach (var entity in Visibility.GetEntitiesInRange(owner.Transform.GridPosition, typeof(WeaponCapacitorChargerComponent), - controller.VisionRadius)) - { - yield return new PutHitscanInCharger(owner, entity, Bonus); - } - } - } -} diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/DropEmptyHitscanExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/DropEmptyHitscanExp.cs deleted file mode 100644 index b293ae3b14..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/DropEmptyHitscanExp.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Inventory; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan -{ - public class DropEmptyHitscanExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatPrepBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - - foreach (var entity in context.GetState().GetValue()) - { - if (entity.HasComponent()) - { - yield return new DropEmptyHitscan(owner, entity, Bonus); - } - } - } - } -} diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/EquipHitscanExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/EquipHitscanExp.cs deleted file mode 100644 index 7f10f22ed0..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/EquipHitscanExp.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Inventory; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan -{ - public sealed class EquipHitscanExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatPrepBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - - foreach (var entity in context.GetState().GetValue()) - { - yield return new EquipHitscan(owner, entity, Bonus); - } - } - } -} diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/PickUpHitscanFromChargersExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/PickUpHitscanFromChargersExp.cs deleted file mode 100644 index 7c272f8fd3..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/PickUpHitscanFromChargersExp.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan; -using Content.Server.AI.Utils; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.GameObjects.Components.Power.Chargers; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan -{ - public sealed class PickUpHitscanFromChargersExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatPrepBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - if (!owner.TryGetComponent(out AiControllerComponent controller)) - { - throw new InvalidOperationException(); - } - - foreach (var entity in Visibility.GetEntitiesInRange(owner.Transform.GridPosition, typeof(WeaponCapacitorChargerComponent), - controller.VisionRadius)) - { - var contained = entity.GetComponent().HeldItem; - - if (contained != null) - { - yield return new PickUpHitscanFromCharger(owner, entity, contained, Bonus); - } - } - } - } -} diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/PickUpRangedExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/PickUpRangedExp.cs deleted file mode 100644 index 91795c6b86..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/PickUpRangedExp.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Combat.Nearby; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; -using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged -{ - public sealed class PickUpRangedExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatPrepBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - - foreach (var entity in context.GetState().GetValue()) - { - if (entity.HasComponent()) - { - yield return new PickUpHitscanWeapon(owner, entity, Bonus); - } - - if (entity.HasComponent()) - { - yield return new PickUpBallisticMagWeapon(owner, entity, Bonus); - } - } - } - } -} diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/RangedAttackNearbySpeciesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/RangedAttackNearbySpeciesExp.cs deleted file mode 100644 index 146e584f22..0000000000 --- a/Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/RangedAttackNearbySpeciesExp.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utility.Actions; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic; -using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan; -using Content.Server.AI.WorldState; -using Content.Server.AI.WorldState.States; -using Content.Server.AI.WorldState.States.Mobs; - -namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged -{ - public sealed class RangedAttackNearbySpeciesExp : ExpandableUtilityAction - { - public override float Bonus => UtilityAction.CombatBonus; - - public override IEnumerable GetActions(Blackboard context) - { - var owner = context.GetState().GetValue(); - - foreach (var entity in context.GetState().GetValue()) - { - yield return new HitscanAttackEntity(owner, entity, Bonus); - yield return new BallisticAttackEntity(owner, entity, Bonus); - } - } - } -} diff --git a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyLaserChargersState.cs b/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyLaserChargersState.cs deleted file mode 100644 index f8e956e92d..0000000000 --- a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyLaserChargersState.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utils; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.GameObjects.Components.Power.Chargers; -using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.WorldState.States.Combat.Nearby -{ - [UsedImplicitly] - public sealed class NearbyLaserChargersState : StateData> - { - public override string Name => "NearbyLaserChargers"; - - public override List GetValue() - { - var nearby = new List(); - - if (!Owner.TryGetComponent(out AiControllerComponent controller)) - { - return nearby; - } - - foreach (var result in Visibility - .GetNearestEntities(Owner.Transform.GridPosition, typeof(WeaponCapacitorChargerComponent), controller.VisionRadius)) - { - nearby.Add(result); - } - - return nearby; - } - } -} diff --git a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyLaserWeapons.cs b/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyLaserWeapons.cs deleted file mode 100644 index 2d3362f109..0000000000 --- a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyLaserWeapons.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utils; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; -using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.WorldState.States.Combat.Nearby -{ - [UsedImplicitly] - public sealed class NearbyLaserWeapons : StateData> - { - public override string Name => "NearbyLaserWeapons"; - - public override List GetValue() - { - var result = new List(); - - if (!Owner.TryGetComponent(out AiControllerComponent controller)) - { - return result; - } - - foreach (var entity in Visibility - .GetNearestEntities(Owner.Transform.GridPosition, typeof(HitscanWeaponComponent), controller.VisionRadius)) - { - result.Add(entity); - } - - return result; - } - } -} diff --git a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyRangedWeapons.cs b/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyRangedWeapons.cs deleted file mode 100644 index 7d2307b3e2..0000000000 --- a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyRangedWeapons.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using Content.Server.AI.Utils; -using Content.Server.GameObjects.Components.Movement; -using Content.Server.GameObjects.Components.Weapon.Ranged; -using JetBrains.Annotations; -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.AI.WorldState.States.Combat.Nearby -{ - [UsedImplicitly] - public sealed class NearbyRangedWeapons : CachedStateData> - { - public override string Name => "NearbyRangedWeapons"; - - protected override List GetTrueValue() - { - var result = new List(); - - if (!Owner.TryGetComponent(out AiControllerComponent controller)) - { - return result; - } - - foreach (var entity in Visibility - .GetNearestEntities(Owner.Transform.GridPosition, typeof(RangedWeaponComponent), controller.VisionRadius)) - { - result.Add(entity); - } - - return result; - } - } -} diff --git a/Content.Server/AI/WorldState/States/Combat/Ranged/Accuracy.cs b/Content.Server/AI/WorldState/States/Combat/Ranged/Accuracy.cs deleted file mode 100644 index 6b44cbcd79..0000000000 --- a/Content.Server/AI/WorldState/States/Combat/Ranged/Accuracy.cs +++ /dev/null @@ -1,16 +0,0 @@ -using JetBrains.Annotations; - -namespace Content.Server.AI.WorldState.States.Combat.Ranged -{ - [UsedImplicitly] - public sealed class Accuracy : StateData - { - public override string Name => "Accuracy"; - - public override float GetValue() - { - // TODO: Maybe just make it a SetValue (maybe make a third type besides sensor / daemon called settablestate) - return 1.0f; - } - } -} diff --git a/Content.Server/AI/WorldState/States/Combat/Ranged/BurstCooldown.cs b/Content.Server/AI/WorldState/States/Combat/Ranged/BurstCooldown.cs deleted file mode 100644 index 3a870a83cb..0000000000 --- a/Content.Server/AI/WorldState/States/Combat/Ranged/BurstCooldown.cs +++ /dev/null @@ -1,17 +0,0 @@ -using JetBrains.Annotations; - -namespace Content.Server.AI.WorldState.States.Combat.Ranged -{ - /// - /// How long to wait between bursts - /// - [UsedImplicitly] - public sealed class BurstCooldown : PlanningStateData - { - public override string Name => "BurstCooldown"; - public override void Reset() - { - Value = 0.0f; - } - } -} diff --git a/Content.Server/AI/WorldState/States/Combat/Ranged/EquippedRangedWeaponAmmo.cs b/Content.Server/AI/WorldState/States/Combat/Ranged/EquippedRangedWeaponAmmo.cs deleted file mode 100644 index 024d55e2e6..0000000000 --- a/Content.Server/AI/WorldState/States/Combat/Ranged/EquippedRangedWeaponAmmo.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Content.Server.GameObjects; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; -using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile; -using JetBrains.Annotations; - -namespace Content.Server.AI.WorldState.States.Combat.Ranged -{ - /// - /// Gets the discrete ammo count - /// - [UsedImplicitly] - public sealed class EquippedRangedWeaponAmmo : StateData - { - public override string Name => "EquippedRangedWeaponAmmo"; - - public override int? GetValue() - { - if (!Owner.TryGetComponent(out HandsComponent handsComponent)) - { - return null; - } - - var equippedItem = handsComponent.GetActiveHand?.Owner; - if (equippedItem == null) return null; - - if (equippedItem.TryGetComponent(out HitscanWeaponComponent hitscanWeaponComponent)) - { - return (int) hitscanWeaponComponent.CapacitorComponent.Charge / hitscanWeaponComponent.BaseFireCost; - } - - if (equippedItem.TryGetComponent(out BallisticMagazineWeaponComponent ballisticComponent)) - { - return ballisticComponent.MagazineSlot.ContainedEntities.Count; - } - - return null; - } - } -} diff --git a/Content.Server/AI/WorldState/States/Combat/Ranged/MaxBurstCount.cs b/Content.Server/AI/WorldState/States/Combat/Ranged/MaxBurstCount.cs deleted file mode 100644 index f7d10301dd..0000000000 --- a/Content.Server/AI/WorldState/States/Combat/Ranged/MaxBurstCount.cs +++ /dev/null @@ -1,17 +0,0 @@ -using JetBrains.Annotations; - -namespace Content.Server.AI.WorldState.States.Combat.Ranged -{ - /// - /// How many shots to take before cooling down - /// - [UsedImplicitly] - public sealed class MaxBurstCount : PlanningStateData - { - public override string Name => "BurstCount"; - public override void Reset() - { - Value = 0; - } - } -} diff --git a/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs b/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs new file mode 100644 index 0000000000..cc1ae73793 --- /dev/null +++ b/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameObjects; + +namespace Content.Server.GameObjects.Components.Access +{ + public sealed class AccessReaderChangeMessage : EntitySystemMessage + { + public EntityUid Uid { get; } + public bool Enabled { get; } + + public AccessReaderChangeMessage(EntityUid uid, bool enabled) + { + Uid = uid; + Enabled = enabled; + } + } +} \ No newline at end of file diff --git a/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs b/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs index f9e6c07a9d..2a1d18ac41 100644 --- a/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs +++ b/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs @@ -69,7 +69,7 @@ namespace Content.Server.GameObjects.Components.Access } [CanBeNull] - private static ICollection FindAccessTags(IEntity entity) + public static ICollection FindAccessTags(IEntity entity) { if (entity.TryGetComponent(out IAccess accessComponent)) { diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs index aa262e1b20..96b2dec4d7 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs @@ -17,6 +17,7 @@ using Robust.Shared.Utility; using Robust.Shared.ViewVariables; using System.Collections.Generic; using System.Linq; +using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects.Systems; namespace Content.Server.GameObjects.Components.Chemistry @@ -219,23 +220,23 @@ namespace Content.Server.GameObjects.Components.Chemistry { protected override void GetData(IEntity user, SolutionComponent component, VerbData data) { - if (user.TryGetComponent(out var hands)) + if (!ActionBlockerSystem.CanInteract(user) || + !user.TryGetComponent(out var hands) || + hands.GetActiveHand == null || + !hands.GetActiveHand.Owner.TryGetComponent(out var solution)) { - if (hands.GetActiveHand != null) - { - if (hands.GetActiveHand.Owner.TryGetComponent(out var solution)) - { - if ((solution.Capabilities & SolutionCaps.PourOut) != 0 && - (component.Capabilities & SolutionCaps.PourIn) != 0) - { - var heldEntityName = hands.GetActiveHand.Owner?.Prototype?.Name ?? ""; - var myName = component.Owner.Prototype?.Name ?? ""; + data.Visibility = VerbVisibility.Invisible; + return; + } - data.Text= $"Transfer liquid from [{heldEntityName}] to [{myName}]."; - return; - } - } - } + if ((solution.Capabilities & SolutionCaps.PourOut) != 0 && + (component.Capabilities & SolutionCaps.PourIn) != 0) + { + var heldEntityName = hands.GetActiveHand.Owner?.Prototype?.Name ?? ""; + var myName = component.Owner.Prototype?.Name ?? ""; + + data.Text= $"Transfer liquid from [{heldEntityName}] to [{myName}]."; + return; } data.Visibility = VerbVisibility.Invisible; @@ -318,23 +319,23 @@ namespace Content.Server.GameObjects.Components.Chemistry { protected override void GetData(IEntity user, SolutionComponent component, VerbData data) { - if (user.TryGetComponent(out var hands)) + if (!ActionBlockerSystem.CanInteract(user) || + !user.TryGetComponent(out var hands) || + hands.GetActiveHand == null || + !hands.GetActiveHand.Owner.TryGetComponent(out var solution)) { - if (hands.GetActiveHand != null) - { - if (hands.GetActiveHand.Owner.TryGetComponent(out var solution)) - { - if ((solution.Capabilities & SolutionCaps.PourIn) != 0 && - (component.Capabilities & SolutionCaps.PourOut) != 0) - { - var heldEntityName = hands.GetActiveHand.Owner?.Prototype?.Name ?? ""; - var myName = component.Owner.Prototype?.Name ?? ""; + data.Visibility = VerbVisibility.Invisible; + return; + } - data.Text = $"Transfer liquid from [{myName}] to [{heldEntityName}]."; - return; - } - } - } + if ((solution.Capabilities & SolutionCaps.PourIn) != 0 && + (component.Capabilities & SolutionCaps.PourOut) != 0) + { + var heldEntityName = hands.GetActiveHand.Owner?.Prototype?.Name ?? ""; + var myName = component.Owner.Prototype?.Name ?? ""; + + data.Text = $"Transfer liquid from [{myName}] to [{heldEntityName}]."; + return; } data.Visibility = VerbVisibility.Invisible; diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs index 68d0c9847a..5ace07e054 100644 --- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs @@ -154,6 +154,8 @@ namespace Content.Server.GameObjects State = DoorState.Open; SetAppearance(DoorVisualState.Open); }, _cancellationTokenSource.Token); + + Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner.Uid, false)); } public virtual bool CanClose() @@ -203,6 +205,7 @@ namespace Content.Server.GameObjects occluder.Enabled = true; } }, _cancellationTokenSource.Token); + Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner.Uid, true)); return true; } diff --git a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs new file mode 100644 index 0000000000..02789749bf --- /dev/null +++ b/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs @@ -0,0 +1,68 @@ +using Content.Server.GameObjects.Components.Weapon; +using Content.Server.GameObjects.EntitySystems; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Containers; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Explosion +{ + /// + /// When triggered will flash in an area around the object and destroy itself + /// + [RegisterComponent] + public class FlashExplosiveComponent : Component, ITimerTrigger, IDestroyAct + { + public override string Name => "FlashExplosive"; + + private float _range; + private double _duration; + private string _sound; + private bool _deleteOnFlash; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + + serializer.DataField(ref _range, "range", 7.0f); + serializer.DataField(ref _duration, "duration", 8.0); + serializer.DataField(ref _sound, "sound", "/Audio/effects/flash_bang.ogg"); + serializer.DataField(ref _deleteOnFlash, "deleteOnFlash", true); + } + + public bool Explode() + { + // If we're in a locker or whatever then can't flash anything + ContainerHelpers.TryGetContainer(Owner, out var container); + if (container == null || !container.Owner.HasComponent()) + { + ServerFlashableComponent.FlashAreaHelper(Owner, _range, _duration); + } + + if (_sound != null) + { + EntitySystem.Get().PlayAtCoords(_sound, Owner.Transform.GridPosition); + } + + if (_deleteOnFlash && !Owner.Deleted) + { + Owner.Delete(); + } + + return true; + } + + bool ITimerTrigger.Trigger(TimerTriggerEventArgs eventArgs) + { + return Explode(); + } + + void IDestroyAct.OnDestroy(DestructionEventArgs eventArgs) + { + Explode(); + } + } +} diff --git a/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs b/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs index 8d9d2e4ce5..e52172a4cd 100644 --- a/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs @@ -1,7 +1,9 @@ using System; using Content.Server.GameObjects.Components.Chemistry; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.Chemistry; using Content.Shared.GameObjects; +using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; @@ -21,7 +23,8 @@ namespace Content.Server.GameObjects.Components.Fluids { protected override void GetData(IEntity user, CanSpillComponent component, VerbData data) { - if (!component.Owner.TryGetComponent(out SolutionComponent solutionComponent)) + if (!ActionBlockerSystem.CanInteract(user) || + !component.Owner.TryGetComponent(out SolutionComponent solutionComponent)) { data.Visibility = VerbVisibility.Invisible; return; diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs index a4604b7d41..5d5a2e9b70 100644 --- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs @@ -23,7 +23,7 @@ using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventory namespace Content.Server.GameObjects { [RegisterComponent] - public class InventoryComponent : SharedInventoryComponent + public class InventoryComponent : SharedInventoryComponent, IExAct { #pragma warning disable 649 [Dependency] private readonly IEntitySystemManager _entitySystemManager; @@ -397,5 +397,25 @@ namespace Content.Server.GameObjects } return new InventoryComponentState(list); } + + void IExAct.OnExplosion(ExplosionEventArgs eventArgs) + { + if (eventArgs.Severity < ExplosionSeverity.Heavy) + { + return; + } + + foreach (var slot in SlotContainers.Values.ToList()) + { + foreach (var entity in slot.ContainedEntities) + { + var exActs = entity.GetAllComponents(); + foreach (var exAct in exActs) + { + exAct.OnExplosion(eventArgs); + } + } + } + } } } diff --git a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs index 7a3ac2e479..32ffcd0e82 100644 --- a/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs +++ b/Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs @@ -3,6 +3,7 @@ using Robust.Shared.Utility; using System; using System.Collections.Generic; +using System.Linq; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects; using Content.Shared.GameObjects; @@ -68,6 +69,8 @@ namespace Content.Server.GameObjects AddHand(handsname); } } + + serializer.DataField(ref activeIndex, "defaultHand", orderedHands.LastOrDefault()); } public IEnumerable GetAllHeldItems() diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index 71d920d5fb..8df9819af5 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Interfaces.GameObjects; using Content.Server.Utility; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -240,6 +241,12 @@ namespace Content.Server.GameObjects.Components.Interactable { protected override void GetData(IEntity user, HandheldLightComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + if (component.Cell == null) { data.Text = "Eject cell (cell missing)"; diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 0b94299c7c..9b4eb1f58b 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -7,6 +7,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Interactable; using Content.Shared.GameObjects.Components.Storage; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -338,8 +339,13 @@ namespace Content.Server.GameObjects.Components { protected override void GetData(IEntity user, EntityStorageComponent component, VerbData data) { - component.OpenVerbGetData(user, component, data); + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + component.OpenVerbGetData(user, component, data); } /// @@ -351,6 +357,12 @@ namespace Content.Server.GameObjects.Components protected virtual void OpenVerbGetData(IEntity user, EntityStorageComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + if (IsWeldedShut) { data.Visibility = VerbVisibility.Disabled; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index f030354d27..e352f9b42e 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -117,7 +117,9 @@ namespace Content.Server.GameObjects { protected override void GetData(IEntity user, ItemComponent component, VerbData data) { - if (ContainerHelpers.IsInContainer(component.Owner) || !component.CanPickup(user)) + if (!ActionBlockerSystem.CanInteract(user) || + ContainerHelpers.IsInContainer(component.Owner) || + !component.CanPickup(user)) { data.Visibility = VerbVisibility.Invisible; return; diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs index 34ab66e526..9f583e5a09 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs @@ -3,6 +3,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Storage; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Robust.Server.GameObjects; using Robust.Server.GameObjects.EntitySystems; @@ -139,7 +140,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage { protected override void GetData(IEntity user, SecureEntityStorageComponent component, VerbData data) { - if (component.Open) + if (!ActionBlockerSystem.CanInteract(user) || component.Open) { data.Visibility = VerbVisibility.Invisible; return; diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs index 27bbc2c942..efff79896e 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs @@ -32,7 +32,7 @@ namespace Content.Server.GameObjects [RegisterComponent] [ComponentReference(typeof(IActivate))] [ComponentReference(typeof(IStorageComponent))] - public class ServerStorageComponent : SharedStorageComponent, IInteractUsing, IUse, IActivate, IStorageComponent, IDestroyAct + public class ServerStorageComponent : SharedStorageComponent, IInteractUsing, IUse, IActivate, IStorageComponent, IDestroyAct, IExAct { #pragma warning disable 649 [Dependency] private readonly IMapManager _mapManager; @@ -364,6 +364,24 @@ namespace Content.Server.GameObjects } } + void IExAct.OnExplosion(ExplosionEventArgs eventArgs) + { + if (eventArgs.Severity < ExplosionSeverity.Heavy) + { + return; + } + + var storedEntities = storage.ContainedEntities.ToList(); + foreach (var entity in storedEntities) + { + var exActs = entity.GetAllComponents(); + foreach (var exAct in exActs) + { + exAct.OnExplosion(eventArgs); + } + } + } + /// /// Inserts an entity into the storage component from the players active hand. /// diff --git a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs index a41c72b31d..53dfca85c1 100644 --- a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs +++ b/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs @@ -2,18 +2,15 @@ using System; using System.Collections.Generic; using Content.Server.GameTicking; using Content.Server.Interfaces.GameTicking; -using NFluidsynth; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; -using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; -using SQLitePCL; using Logger = Robust.Shared.Log.Logger; namespace Content.Server.GameObjects.Components.Markers diff --git a/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs b/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs new file mode 100644 index 0000000000..96aa996204 --- /dev/null +++ b/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Random; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; +using Timer = Robust.Shared.Timers.Timer; + +namespace Content.Server.GameObjects.Components.Markers +{ + [RegisterComponent] + public class TimedSpawnerComponent : Component + { +#pragma warning disable 649 + [Dependency] private IEntityManager _entityManager; + [Dependency] private IRobustRandom _robustRandom; +#pragma warning restore 649 + + public override string Name => "TimedSpawner"; + + [ViewVariables(VVAccess.ReadWrite)] + public List Prototypes { get; set; } = new List(); + + [ViewVariables(VVAccess.ReadWrite)] + public float Chance { get; set; } = 1.0f; + + [ViewVariables(VVAccess.ReadWrite)] + public int IntervalSeconds { get; set; } = 60; + + [ViewVariables(VVAccess.ReadWrite)] + public int MinimumEntitiesSpawned { get; set; } = 1; + + [ViewVariables(VVAccess.ReadWrite)] + public int MaximumEntitiesSpawned { get; set; } = 1; + + private CancellationTokenSource TokenSource; + + public override void Initialize() + { + base.Initialize(); + SetupTimer(); + } + + protected override void Shutdown() + { + base.Shutdown(); + TokenSource.Cancel(); + } + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + + serializer.DataField(this, x => Prototypes, "prototypes", new List()); + serializer.DataField(this, x => Chance, "chance", 1.0f); + serializer.DataField(this, x => IntervalSeconds, "intervalSeconds", 60); + serializer.DataField(this, x => MinimumEntitiesSpawned, "minimumEntitiesSpawned", 1); + serializer.DataField(this, x => MaximumEntitiesSpawned, "maximumEntitiesSpawned", 1); + + if(MinimumEntitiesSpawned > MaximumEntitiesSpawned) + throw new ArgumentException("MaximumEntitiesSpawned can't be lower than MinimumEntitiesSpawned!"); + } + + private void SetupTimer() + { + TokenSource?.Cancel(); + TokenSource = new CancellationTokenSource(); + Timer.SpawnRepeating(TimeSpan.FromSeconds(IntervalSeconds), OnTimerFired, TokenSource.Token); + } + + private void OnTimerFired() + { + if (!_robustRandom.Prob(Chance)) + return; + + var number = _robustRandom.Next(MinimumEntitiesSpawned, MaximumEntitiesSpawned); + + for (int i = 0; i < number; i++) + { + var entity = _robustRandom.Pick(Prototypes); + _entityManager.SpawnEntity(entity, Owner.Transform.GridPosition); + } + } + } +} diff --git a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs index d3ef519309..08d7c86f77 100644 --- a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs +++ b/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Medical; using Content.Server.GameObjects.Components.Power; using Content.Server.Utility; +using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.UserInterface; @@ -133,6 +134,12 @@ namespace Content.Server.GameObjects.Components.Medical { protected override void GetData(IEntity user, MedicalScannerComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + data.Text = "Enter"; data.Visibility = component.IsOccupied ? VerbVisibility.Invisible : VerbVisibility.Visible; } @@ -148,6 +155,12 @@ namespace Content.Server.GameObjects.Components.Medical { protected override void GetData(IEntity user, MedicalScannerComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + data.Text = "Eject"; data.Visibility = component.IsOccupied ? VerbVisibility.Visible : VerbVisibility.Invisible; } diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs index 428447d8da..e9930546ef 100644 --- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs @@ -187,6 +187,17 @@ namespace Content.Server.GameObjects.Components.Mobs _statusRemoveCancellation = new CancellationTokenSource(); } + public void ResetStuns() + { + _stunnedTimer = 0f; + _slowdownTimer = 0f; + + if (KnockedDown) + StandingStateHelper.Standing(Owner); + + _knockdownTimer = 0f; + } + public void Update(float delta) { if (Stunned) diff --git a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs b/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs index b477f299e4..61739f4029 100644 --- a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs @@ -59,7 +59,7 @@ namespace Content.Server.GameObjects.Components.Movement protected override void Shutdown() { base.Shutdown(); - Processor.Shutdown(); + Processor?.Shutdown(); } /// @@ -125,6 +125,6 @@ namespace Content.Server.GameObjects.Components.Movement [ViewVariables(VVAccess.ReadWrite)] public float StepSoundDistance { get; set; } public void SetVelocityDirection(Direction direction, ushort subTick, bool enabled) { } - public void SetSprinting(ushort subTick, bool enabled) { } + public void SetSprinting(ushort subTick, bool walking) { } } } diff --git a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs index d448564edd..d541b4d686 100644 --- a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs +++ b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs @@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.Components.Movement } } - public void SetSprinting(ushort subTick, bool enabled) + public void SetSprinting(ushort subTick, bool walking) { // Shuttles can't sprint. } diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs index 242efc0d0b..ef13d79fb9 100644 --- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs @@ -1,8 +1,11 @@ using System; +using System.Collections.Generic; using Content.Server.GameObjects.Components.Chemistry; -using Content.Server.GameObjects.Components.Sound; +using Content.Server.GameObjects.Components.Utensil; using Content.Server.GameObjects.EntitySystems; +using Content.Server.Utility; using Content.Shared.Chemistry; +using Content.Shared.GameObjects.Components.Utensil; using Content.Shared.Interfaces; using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.Audio; @@ -10,6 +13,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; +using Robust.Shared.Log; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -32,18 +36,28 @@ namespace Content.Server.GameObjects.Components.Nutrition private SolutionComponent _contents; [ViewVariables] private ReagentUnit _transferAmount; + private UtensilType _utensilsNeeded; public int UsesRemaining => _contents.CurrentVolume == 0 ? 0 : Math.Max(1, (int)Math.Ceiling((_contents.CurrentVolume / _transferAmount).Float())); - public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); serializer.DataField(ref _useSound, "useSound", "/Audio/items/eatfood.ogg"); serializer.DataField(ref _transferAmount, "transferAmount", ReagentUnit.New(5)); - serializer.DataField(ref _trashPrototype, "trash", "TrashPlate"); + serializer.DataField(ref _trashPrototype, "trash", null); + + if (serializer.Reading) + { + var utensils = serializer.ReadDataField("utensils", new List()); + foreach (var utensil in utensils) + { + _utensilsNeeded |= utensil; + Dirty(); + } + } } public override void Initialize() @@ -55,15 +69,27 @@ namespace Content.Server.GameObjects.Components.Nutrition bool IUse.UseEntity(UseEntityEventArgs eventArgs) { + if (_utensilsNeeded != UtensilType.None) + { + eventArgs.User.PopupMessage(eventArgs.User, Loc.GetString("You need to use a {0} to eat that!", _utensilsNeeded)); + return false; + } + return TryUseFood(eventArgs.User, null); } + // Feeding someone else void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs) { + if (eventArgs.Target == null) + { + return; + } + TryUseFood(eventArgs.User, eventArgs.Target); } - private bool TryUseFood(IEntity user, IEntity target) + public bool TryUseFood(IEntity user, IEntity target, UtensilComponent utensilUsed = null) { if (user == null) { @@ -78,20 +104,65 @@ namespace Content.Server.GameObjects.Components.Nutrition var trueTarget = target ?? user; - if (trueTarget.TryGetComponent(out StomachComponent stomachComponent)) + if (!trueTarget.TryGetComponent(out StomachComponent stomach)) { - var transferAmount = ReagentUnit.Min(_transferAmount, _contents.CurrentVolume); - var split = _contents.SplitSolution(transferAmount); - if (stomachComponent.TryTransferSolution(split)) + return false; + } + + var utensils = utensilUsed != null + ? new List {utensilUsed} + : null; + + if (_utensilsNeeded != UtensilType.None) + { + utensils = new List(); + var types = UtensilType.None; + + if (user.TryGetComponent(out HandsComponent hands)) { - _entitySystem.GetEntitySystem() - .PlayFromEntity(_useSound, trueTarget, AudioParams.Default.WithVolume(-1f)); - trueTarget.PopupMessage(user, Loc.GetString("Nom")); + foreach (var item in hands.GetAllHeldItems()) + { + if (!item.Owner.TryGetComponent(out UtensilComponent utensil)) + { + continue; + } + + utensils.Add(utensil); + types |= utensil.Types; + } } - else + + if (!types.HasFlag(_utensilsNeeded)) { - _contents.TryAddSolution(split); - trueTarget.PopupMessage(user, Loc.GetString("You can't eat any more!")); + trueTarget.PopupMessage(user, Loc.GetString("You need to be holding a {0} to eat that!", _utensilsNeeded)); + return false; + } + } + + if (!InteractionChecks.InRangeUnobstructed(user, trueTarget.Transform.MapPosition)) + { + return false; + } + + var transferAmount = ReagentUnit.Min(_transferAmount, _contents.CurrentVolume); + var split = _contents.SplitSolution(transferAmount); + if (!stomach.TryTransferSolution(split)) + { + _contents.TryAddSolution(split); + trueTarget.PopupMessage(user, Loc.GetString("You can't eat any more!")); + return false; + } + + _entitySystem.GetEntitySystem() + .PlayFromEntity(_useSound, trueTarget, AudioParams.Default.WithVolume(-1f)); + trueTarget.PopupMessage(user, Loc.GetString("Nom")); + + // If utensils were used + if (utensils != null) + { + foreach (var utensil in utensils) + { + utensil.TryBreak(user); } } @@ -100,21 +171,35 @@ namespace Content.Server.GameObjects.Components.Nutrition return true; } + if (string.IsNullOrEmpty(_trashPrototype)) + { + Owner.Delete(); + return true; + } + //We're empty. Become trash. var position = Owner.Transform.GridPosition; - Owner.Delete(); var finisher = Owner.EntityManager.SpawnEntity(_trashPrototype, position); - if (user.TryGetComponent(out HandsComponent handsComponent) && finisher.TryGetComponent(out ItemComponent itemComponent)) + + // If the user is holding the item + if (user.TryGetComponent(out HandsComponent handsComponent) && + handsComponent.IsHolding(Owner)) { - if (handsComponent.CanPutInHand(itemComponent)) + Owner.Delete(); + + // Put the trash in the user's hand + if (finisher.TryGetComponent(out ItemComponent item) && + handsComponent.CanPutInHand(item)) { - handsComponent.PutInHand(itemComponent); - return true; + handsComponent.PutInHand(item); } } - finisher.Transform.GridPosition = user.Transform.GridPosition; - return true; + else + { + Owner.Delete(); + } + return true; } } } diff --git a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs index f70cd43a9e..78328c9c94 100644 --- a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs +++ b/Content.Server/GameObjects/Components/PDA/PDAComponent.cs @@ -8,6 +8,7 @@ using Content.Server.Interfaces; using Content.Server.Interfaces.PDA; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.PDA; +using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.UserInterface; @@ -250,6 +251,12 @@ namespace Content.Server.GameObjects.Components.PDA { protected override void GetData(IEntity user, PDAComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + data.Text = Loc.GetString("Eject ID"); data.Visibility = component.IdSlotEmpty ? VerbVisibility.Invisible : VerbVisibility.Visible; } diff --git a/Content.Server/GameObjects/Components/Power/Chargers/BaseCharger.cs b/Content.Server/GameObjects/Components/Power/Chargers/BaseCharger.cs index ffd26a8cb6..655fa634ca 100644 --- a/Content.Server/GameObjects/Components/Power/Chargers/BaseCharger.cs +++ b/Content.Server/GameObjects/Components/Power/Chargers/BaseCharger.cs @@ -1,4 +1,5 @@ using System; +using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; using Content.Shared.GameObjects.Components.Power; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -13,7 +14,7 @@ namespace Content.Server.GameObjects.Components.Power.Chargers public abstract class BaseCharger : Component { - public IEntity HeldItem { get; protected set; } + protected IEntity _heldItem; protected ContainerSlot _container; protected PowerDeviceComponent _powerDevice; public CellChargerStatus Status => _status; @@ -58,37 +59,28 @@ namespace Content.Server.GameObjects.Components.Power.Chargers } /// - /// This will remove the item directly into the user's hand rather than the floor + /// This will remove the item directly into the user's hand / floor /// /// - public void RemoveItemToHand(IEntity user) + public void RemoveItem(IEntity user) { var heldItem = _container.ContainedEntity; if (heldItem == null) { return; } - RemoveItem(); - if (user.TryGetComponent(out HandsComponent handsComponent) && - heldItem.TryGetComponent(out ItemComponent itemComponent)) + _container.Remove(heldItem); + if (user.TryGetComponent(out HandsComponent handsComponent)) { - handsComponent.PutInHand(itemComponent); - } - } - - /// - /// Will put the charger's item on the floor if available - /// - public void RemoveItem() - { - if (_container.ContainedEntity == null) - { - return; + handsComponent.PutInHandOrDrop(heldItem.GetComponent()); } - _container.Remove(HeldItem); - HeldItem = null; + if (heldItem.TryGetComponent(out ServerBatteryBarrelComponent batteryBarrelComponent)) + { + batteryBarrelComponent.UpdateAppearance(); + } + UpdateStatus(); } @@ -135,8 +127,6 @@ namespace Content.Server.GameObjects.Components.Power.Chargers } _appearanceComponent?.SetData(CellVisual.Occupied, _container.ContainedEntity != null); - - _status = status; } public void OnUpdate(float frameTime) diff --git a/Content.Server/GameObjects/Components/Power/Chargers/PowerCellChargerComponent.cs b/Content.Server/GameObjects/Components/Power/Chargers/PowerCellChargerComponent.cs index 198e9ed5ab..0cd13e4ecc 100644 --- a/Content.Server/GameObjects/Components/Power/Chargers/PowerCellChargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/Chargers/PowerCellChargerComponent.cs @@ -3,6 +3,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Utility; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Power; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -53,7 +54,7 @@ namespace Content.Server.GameObjects.Components.Power.Chargers void IActivate.Activate(ActivateEventArgs eventArgs) { - RemoveItemToHand(eventArgs.User); + RemoveItem(eventArgs.User); } [Verb] @@ -61,6 +62,12 @@ namespace Content.Server.GameObjects.Components.Power.Chargers { protected override void GetData(IEntity user, PowerCellChargerComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + if (!user.TryGetComponent(out HandsComponent handsComponent)) { data.Visibility = VerbVisibility.Invisible; @@ -99,6 +106,12 @@ namespace Content.Server.GameObjects.Components.Power.Chargers { protected override void GetData(IEntity user, PowerCellChargerComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + if (component._container.ContainedEntity == null) { data.Text = "Eject"; @@ -111,7 +124,7 @@ namespace Content.Server.GameObjects.Components.Power.Chargers protected override void Activate(IEntity user, PowerCellChargerComponent component) { - component.RemoveItem(); + component.RemoveItem(user); } } @@ -122,9 +135,8 @@ namespace Content.Server.GameObjects.Components.Power.Chargers { return false; } - - HeldItem = entity; - if (!_container.Insert(HeldItem)) + + if (!_container.Insert(entity)) { return false; } @@ -157,7 +169,7 @@ namespace Content.Server.GameObjects.Components.Power.Chargers { // Two numbers: One for how much power actually goes into the device (chargeAmount) and // chargeLoss which is how much is drawn from the powernet - _container.ContainedEntity.TryGetComponent(out PowerCellComponent cellComponent); + var cellComponent = _container.ContainedEntity.GetComponent(); var chargeLoss = cellComponent.RequestCharge(frameTime) * _transferRatio; _powerDevice.Load = chargeLoss; diff --git a/Content.Server/GameObjects/Components/Power/Chargers/WeaponCapacitorChargerComponent.cs b/Content.Server/GameObjects/Components/Power/Chargers/WeaponCapacitorChargerComponent.cs index d90105e855..a376d37300 100644 --- a/Content.Server/GameObjects/Components/Power/Chargers/WeaponCapacitorChargerComponent.cs +++ b/Content.Server/GameObjects/Components/Power/Chargers/WeaponCapacitorChargerComponent.cs @@ -1,18 +1,14 @@ using System; -using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan; +using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; using Content.Server.GameObjects.EntitySystems; -using Content.Server.Utility; using Content.Shared.GameObjects; using Content.Shared.GameObjects.Components.Power; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; -using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Localization; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Power.Chargers { @@ -26,8 +22,8 @@ namespace Content.Server.GameObjects.Components.Power.Chargers { public override string Name => "WeaponCapacitorCharger"; public override double CellChargePercent => _container.ContainedEntity != null ? - _container.ContainedEntity.GetComponent().Charge / - _container.ContainedEntity.GetComponent().Capacity * 100 : 0.0f; + _container.ContainedEntity.GetComponent().PowerCell.Charge / + _container.ContainedEntity.GetComponent().PowerCell.Capacity * 100 : 0.0f; bool IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) { @@ -43,7 +39,7 @@ namespace Content.Server.GameObjects.Components.Power.Chargers void IActivate.Activate(ActivateEventArgs eventArgs) { - RemoveItemToHand(eventArgs.User); + RemoveItem(eventArgs.User); } [Verb] @@ -51,6 +47,12 @@ namespace Content.Server.GameObjects.Components.Power.Chargers { protected override void GetData(IEntity user, WeaponCapacitorChargerComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + if (!user.TryGetComponent(out HandsComponent handsComponent)) { data.Visibility = VerbVisibility.Invisible; @@ -94,6 +96,12 @@ namespace Content.Server.GameObjects.Components.Power.Chargers { protected override void GetData(IEntity user, WeaponCapacitorChargerComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + if (component._container.ContainedEntity == null) { data.Visibility = VerbVisibility.Disabled; @@ -106,21 +114,19 @@ namespace Content.Server.GameObjects.Components.Power.Chargers protected override void Activate(IEntity user, WeaponCapacitorChargerComponent component) { - component.RemoveItem(); + component.RemoveItem(user); } } public bool TryInsertItem(IEntity entity) { - if (!entity.HasComponent() || + if (!entity.HasComponent() || _container.ContainedEntity != null) { return false; } - HeldItem = entity; - - if (!_container.Insert(HeldItem)) + if (!_container.Insert(entity)) { return false; } @@ -140,8 +146,8 @@ namespace Content.Server.GameObjects.Components.Power.Chargers return CellChargerStatus.Empty; } - if (_container.ContainedEntity.TryGetComponent(out HitscanWeaponCapacitorComponent component) && - Math.Abs(component.Capacity - component.Charge) < 0.01) + if (_container.ContainedEntity.TryGetComponent(out ServerBatteryBarrelComponent component) && + Math.Abs(component.PowerCell.Capacity - component.PowerCell.Charge) < 0.01) { return CellChargerStatus.Charged; } @@ -153,8 +159,8 @@ namespace Content.Server.GameObjects.Components.Power.Chargers { // Two numbers: One for how much power actually goes into the device (chargeAmount) and // chargeLoss which is how much is drawn from the powernet - _container.ContainedEntity.TryGetComponent(out HitscanWeaponCapacitorComponent weaponCapacitorComponent); - var chargeLoss = weaponCapacitorComponent.RequestCharge(frameTime) * _transferRatio; + var powerCell = _container.ContainedEntity.GetComponent().PowerCell; + var chargeLoss = powerCell.RequestCharge(frameTime) * _transferRatio; _powerDevice.Load = chargeLoss; if (!_powerDevice.Powered) @@ -165,14 +171,13 @@ namespace Content.Server.GameObjects.Components.Power.Chargers var chargeAmount = chargeLoss * _transferEfficiency; - weaponCapacitorComponent.AddCharge(chargeAmount); + powerCell.AddCharge(chargeAmount); // Just so the sprite won't be set to 99.99999% visibility - if (weaponCapacitorComponent.Capacity - weaponCapacitorComponent.Charge < 0.01) + if (powerCell.Capacity - powerCell.Charge < 0.01) { - weaponCapacitorComponent.Charge = weaponCapacitorComponent.Capacity; + powerCell.Charge = powerCell.Capacity; } UpdateStatus(); } - } } diff --git a/Content.Server/GameObjects/Components/Power/SolarPanelComponent.cs b/Content.Server/GameObjects/Components/Power/SolarPanelComponent.cs index e814a7b0d7..d6daefeb90 100644 --- a/Content.Server/GameObjects/Components/Power/SolarPanelComponent.cs +++ b/Content.Server/GameObjects/Components/Power/SolarPanelComponent.cs @@ -7,6 +7,7 @@ using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; +using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Prototypes; diff --git a/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs new file mode 100644 index 0000000000..231e4ab707 --- /dev/null +++ b/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs @@ -0,0 +1,37 @@ +using System; +using Content.Server.GameObjects.Components.Explosion; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Log; + +namespace Content.Server.GameObjects.Components.Projectiles +{ + [RegisterComponent] + public class ExplosiveProjectileComponent : Component, ICollideBehavior + { + public override string Name => "ExplosiveProjectile"; + + public override void Initialize() + { + base.Initialize(); + if (!Owner.HasComponent()) + { + Logger.Error("ExplosiveProjectiles need an ExplosiveComponent"); + throw new InvalidOperationException(); + } + } + + void ICollideBehavior.CollideWith(IEntity entity) + { + var explosiveComponent = Owner.GetComponent(); + explosiveComponent.Explosion(); + } + + // Projectile should handle the deleting + void ICollideBehavior.PostCollide(int collisionCount) + { + return; + } + } +} \ No newline at end of file diff --git a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs new file mode 100644 index 0000000000..381ebdd19e --- /dev/null +++ b/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Weapon; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Physics; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Projectiles +{ + /// + /// Upon colliding with an object this will flash in an area around it + /// + [RegisterComponent] + public class FlashProjectileComponent : Component, ICollideBehavior + { + public override string Name => "FlashProjectile"; + + private double _range; + private double _duration; + + private bool _flashed; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _range, "range", 1.0); + serializer.DataField(ref _duration, "duration", 8.0); + } + + public override void Initialize() + { + base.Initialize(); + // Shouldn't be using this without a ProjectileComponent because it will just immediately collide with thrower + if (!Owner.HasComponent()) + { + throw new InvalidOperationException(); + } + } + + void ICollideBehavior.CollideWith(IEntity entity) + { + if (_flashed) + { + return; + } + ServerFlashableComponent.FlashAreaHelper(Owner, _range, _duration); + _flashed = true; + } + + // Projectile should handle the deleting + void ICollideBehavior.PostCollide(int collisionCount) + { + return; + } + } +} diff --git a/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs b/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs new file mode 100644 index 0000000000..994d301c1f --- /dev/null +++ b/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs @@ -0,0 +1,174 @@ +using System; +using Content.Shared.GameObjects; +using Content.Shared.Physics; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Physics; +using Robust.Shared.Serialization; +using Timer = Robust.Shared.Timers.Timer; + +namespace Content.Server.GameObjects.Components.Projectiles +{ + /// + /// Lasers etc. + /// + [RegisterComponent] + public class HitscanComponent : Component + { + public override string Name => "Hitscan"; + public CollisionGroup CollisionMask => (CollisionGroup) _collisionMask; + private int _collisionMask; + + public float Damage + { + get => _damage; + set => _damage = value; + } + private float _damage; + public DamageType DamageType => _damageType; + private DamageType _damageType; + public float MaxLength => 20.0f; + + private TimeSpan _startTime; + private TimeSpan _deathTime; + + public float ColorModifier { get; set; } = 1.0f; + private string _spriteName; + private string _muzzleFlash; + private string _impactFlash; + private string _soundHitWall; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _collisionMask, "layers", (int) CollisionGroup.Opaque, WithFormat.Flags()); + serializer.DataField(ref _damage, "damage", 10.0f); + serializer.DataField(ref _damageType, "damageType", DamageType.Heat); + serializer.DataField(ref _spriteName, "spriteName", "Objects/Guns/Projectiles/laser.png"); + serializer.DataField(ref _muzzleFlash, "muzzleFlash", null); + serializer.DataField(ref _impactFlash, "impactFlash", null); + serializer.DataField(ref _soundHitWall, "soundHitWall", "/Audio/Guns/Hits/laser_sear_wall.ogg"); + } + + public void FireEffects(IEntity user, float distance, Angle angle, IEntity hitEntity = null) + { + var effectSystem = EntitySystem.Get(); + _startTime = IoCManager.Resolve().CurTime; + _deathTime = _startTime + TimeSpan.FromSeconds(1); + + var afterEffect = AfterEffects(user.Transform.GridPosition, angle, distance, 1.0f); + if (afterEffect != null) + { + effectSystem.CreateParticle(afterEffect); + } + + // if we're too close we'll stop the impact and muzzle / impact sprites from clipping + if (distance > 1.0f) + { + var impactEffect = ImpactFlash(distance, angle); + if (impactEffect != null) + { + effectSystem.CreateParticle(impactEffect); + } + + var muzzleEffect = MuzzleFlash(user.Transform.GridPosition, angle); + if (muzzleEffect != null) + { + effectSystem.CreateParticle(muzzleEffect); + } + } + + if (hitEntity != null && _soundHitWall != null) + { + // TODO: No wall component so ? + var offset = angle.ToVec().Normalized / 2; + EntitySystem.Get().PlayAtCoords(_soundHitWall, user.Transform.GridPosition.Translated(offset)); + } + + Timer.Spawn((int) _deathTime.TotalMilliseconds, () => + { + if (!Owner.Deleted) + { + Owner.Delete(); + } + }); + } + + private EffectSystemMessage MuzzleFlash(GridCoordinates grid, Angle angle) + { + if (_muzzleFlash == null) + { + return null; + } + + var offset = angle.ToVec().Normalized / 2; + + var message = new EffectSystemMessage + { + EffectSprite = _muzzleFlash, + Born = _startTime, + DeathTime = _deathTime, + Coordinates = grid.Translated(offset), + //Rotated from east facing + Rotation = (float) angle.Theta, + Color = Vector4.Multiply(new Vector4(255, 255, 255, 750), ColorModifier), + ColorDelta = new Vector4(0, 0, 0, -1500f), + Shaded = false + }; + + return message; + } + + private EffectSystemMessage AfterEffects(GridCoordinates origin, Angle angle, float distance, float offset = 0.0f) + { + var midPointOffset = angle.ToVec() * distance / 2; + var message = new EffectSystemMessage + { + EffectSprite = _spriteName, + Born = _startTime, + DeathTime = _deathTime, + Size = new Vector2(distance - offset, 1f), + Coordinates = origin.Translated(midPointOffset), + //Rotated from east facing + Rotation = (float) angle.Theta, + Color = Vector4.Multiply(new Vector4(255, 255, 255, 750), ColorModifier), + ColorDelta = new Vector4(0, 0, 0, -1500f), + + Shaded = false + }; + + return message; + } + + private EffectSystemMessage ImpactFlash(float distance, Angle angle) + { + if (_impactFlash == null) + { + return null; + } + + var message = new EffectSystemMessage + { + EffectSprite = _impactFlash, + Born = _startTime, + DeathTime = _deathTime, + Coordinates = Owner.Transform.GridPosition.Translated(angle.ToVec() * distance), + //Rotated from east facing + Rotation = (float) angle.FlipPositive(), + Color = Vector4.Multiply(new Vector4(255, 255, 255, 750), ColorModifier), + ColorDelta = new Vector4(0, 0, 0, -1500f), + Shaded = false + }; + + return message; + } + } +} diff --git a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs index 0d2d309368..f3598eddb5 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs @@ -2,9 +2,13 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Shared.GameObjects; using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Components; +using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -18,24 +22,32 @@ namespace Content.Server.GameObjects.Components.Projectiles public bool IgnoreShooter = true; - private EntityUid Shooter = EntityUid.Invalid; + private EntityUid _shooter = EntityUid.Invalid; private Dictionary _damages; + [ViewVariables] - public Dictionary Damages => _damages; - private float _velocity; - public float Velocity + public Dictionary Damages { - get => _velocity; - set => _velocity = value; + get => _damages; + set => _damages = value; } + + public bool DeleteOnCollide => _deleteOnCollide; + private bool _deleteOnCollide; + + // Get that juicy FPS hit sound + private string _soundHit; + private string _soundHitSpecies; public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); + serializer.DataField(ref _deleteOnCollide, "delete_on_collide", true); // If not specified 0 damage serializer.DataField(ref _damages, "damages", new Dictionary()); - serializer.DataField(ref _velocity, "velocity", 20f); + serializer.DataField(ref _soundHit, "soundHit", null); + serializer.DataField(ref _soundHitSpecies, "soundHitSpecies", null); } public float TimeLeft { get; set; } = 10; @@ -46,7 +58,7 @@ namespace Content.Server.GameObjects.Components.Projectiles /// public void IgnoreEntity(IEntity shooter) { - Shooter = shooter.Uid; + _shooter = shooter.Uid; } /// @@ -56,7 +68,7 @@ namespace Content.Server.GameObjects.Components.Projectiles /// bool ICollideSpecial.PreventCollide(IPhysBody collidedwith) { - if (IgnoreShooter && collidedwith.Owner.Uid == Shooter) + if (IgnoreShooter && collidedwith.Owner.Uid == _shooter) return true; return false; } @@ -67,9 +79,17 @@ namespace Content.Server.GameObjects.Components.Projectiles /// void ICollideBehavior.CollideWith(IEntity entity) { + if (_soundHitSpecies != null && entity.HasComponent()) + { + EntitySystem.Get().PlayAtCoords(_soundHitSpecies, entity.Transform.GridPosition); + } else if (_soundHit != null) + { + EntitySystem.Get().PlayAtCoords(_soundHit, entity.Transform.GridPosition); + } + if (entity.TryGetComponent(out DamageableComponent damage)) { - Owner.EntityManager.TryGetEntity(Shooter, out var shooter); + Owner.EntityManager.TryGetEntity(_shooter, out var shooter); foreach (var (damageType, amount) in _damages) { @@ -87,7 +107,7 @@ namespace Content.Server.GameObjects.Components.Projectiles void ICollideBehavior.PostCollide(int collideCount) { - if (collideCount > 0) Owner.Delete(); + if (collideCount > 0 && DeleteOnCollide) Owner.Delete(); } } } diff --git a/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs new file mode 100644 index 0000000000..b09881d2af --- /dev/null +++ b/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs @@ -0,0 +1,54 @@ +using System; +using Content.Server.GameObjects.Components.Mobs; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Log; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Projectiles +{ + /// + /// Adds stun when it collides with an entity + /// + [RegisterComponent] + public sealed class StunnableProjectileComponent : Component, ICollideBehavior + { + public override string Name => "StunnableProjectile"; + + // See stunnable for what these do + private int _stunAmount; + private int _knockdownAmount; + private int _slowdownAmount; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _stunAmount, "stunAmount", 0); + serializer.DataField(ref _knockdownAmount, "knockdownAmount", 0); + serializer.DataField(ref _slowdownAmount, "slowdownAmount", 0); + } + + public override void Initialize() + { + base.Initialize(); + if (!Owner.HasComponent()) + { + Logger.Error("StunProjectile entity must have a ProjectileComponent"); + throw new InvalidOperationException(); + } + } + + void ICollideBehavior.CollideWith(IEntity entity) + { + if (entity.TryGetComponent(out StunnableComponent stunnableComponent)) + { + stunnableComponent.Stun(_stunAmount); + stunnableComponent.Knockdown(_knockdownAmount); + stunnableComponent.Slowdown(_slowdownAmount); + } + } + + void ICollideBehavior.PostCollide(int collidedCount) {} + } +} diff --git a/Content.Server/GameObjects/Components/RotatableComponent.cs b/Content.Server/GameObjects/Components/RotatableComponent.cs index 01eba427dc..8ef6d6484b 100644 --- a/Content.Server/GameObjects/Components/RotatableComponent.cs +++ b/Content.Server/GameObjects/Components/RotatableComponent.cs @@ -1,5 +1,7 @@ +using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.GameObjects; +using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; @@ -37,6 +39,12 @@ namespace Content.Server.GameObjects.Components { protected override void GetData(IEntity user, RotatableComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + data.CategoryData = VerbCategories.Rotate; data.Text = "Rotate clockwise"; data.IconTexture = "/Textures/UserInterface/VerbIcons/rotate_cw.svg.96dpi.png"; @@ -53,6 +61,12 @@ namespace Content.Server.GameObjects.Components { protected override void GetData(IEntity user, RotatableComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + data.CategoryData = VerbCategories.Rotate; data.Text = "Rotate counter-clockwise"; data.IconTexture = "/Textures/UserInterface/VerbIcons/rotate_ccw.svg.96dpi.png"; diff --git a/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs new file mode 100644 index 0000000000..3069bd72c3 --- /dev/null +++ b/Content.Server/GameObjects/Components/Utensil/UtensilComponent.cs @@ -0,0 +1,124 @@ +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Nutrition; +using Content.Server.GameObjects.EntitySystems; +using Content.Server.Utility; +using Content.Shared.GameObjects.Components.Utensil; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Random; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; + +namespace Content.Server.GameObjects.Components.Utensil +{ + [RegisterComponent] + public class UtensilComponent : SharedUtensilComponent, IAfterInteract + { +#pragma warning disable 649 + [Dependency] private readonly IEntitySystemManager _entitySystem; + [Dependency] private readonly IRobustRandom _random; +#pragma warning restore 649 + + protected UtensilType _types = UtensilType.None; + + [ViewVariables] + public override UtensilType Types + { + get => _types; + set + { + _types = value; + Dirty(); + } + } + + /// + /// The chance that the utensil has to break with each use. + /// A value of 0 means that it is unbreakable. + /// + [ViewVariables] + private float _breakChance; + + /// + /// The sound to be played if the utensil breaks. + /// + [ViewVariables] + private string _breakSound; + + public void AddType(UtensilType type) + { + Types |= type; + } + + public bool HasAnyType(UtensilType type) + { + return (_types & type) != UtensilType.None; + } + + public bool HasType(UtensilType type) + { + return _types.HasFlag(type); + } + + public void RemoveType(UtensilType type) + { + Types &= ~type; + } + + internal void TryBreak(IEntity user) + { + if (_random.Prob(_breakChance)) + { + _entitySystem.GetEntitySystem() + .PlayFromEntity(_breakSound, user, AudioParams.Default.WithVolume(-2f)); + Owner.Delete(); + } + } + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + + if (serializer.Reading) + { + var types = serializer.ReadDataField("types", new List()); + foreach (var type in types) + { + AddType(type); + } + } + + serializer.DataField(ref _breakChance, "breakChance", 0); + serializer.DataField(ref _breakSound, "breakSound", "/Audio/items/snap.ogg"); + } + + void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs) + { + TryUseUtensil(eventArgs.User, eventArgs.Target); + } + + private void TryUseUtensil(IEntity user, IEntity target) + { + if (user == null || target == null) + { + return; + } + + if (!target.TryGetComponent(out FoodComponent food)) + { + return; + } + + if (!InteractionChecks.InRangeUnobstructed(user, target.Transform.MapPosition)) + { + return; + } + + food.TryUseFood(user, null, this); + } + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs index 2c9985e99b..4275e70209 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs @@ -5,6 +5,7 @@ using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces.GameObjects; using Content.Shared.Audio; using Content.Shared.GameObjects; +using Content.Shared.GameObjects.EntitySystems; using Content.Shared.Interfaces; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; @@ -39,7 +40,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee [ViewVariables] private ContainerSlot _cellContainer; [ViewVariables(VVAccess.ReadWrite)] - private float _paralyzeChance = 0.25f; + private float _paralyzeChanceNoSlowdown = 0.35f; + + [ViewVariables(VVAccess.ReadWrite)] + private float _paralyzeChanceWithSlowdown = 0.85f; [ViewVariables(VVAccess.ReadWrite)] private float _paralyzeTime = 10f; @@ -75,7 +79,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee { base.ExposeData(serializer); - serializer.DataField(ref _paralyzeChance, "paralyzeChance", 0.25f); + serializer.DataField(ref _paralyzeChanceNoSlowdown, "paralyzeChanceNoSlowdown", 0.35f); + serializer.DataField(ref _paralyzeChanceWithSlowdown, "paralyzeChanceWithSlowdown", 0.85f); serializer.DataField(ref _paralyzeTime, "paralyzeTime", 10f); serializer.DataField(ref _slowdownTime, "slowdownTime", 5f); } @@ -92,10 +97,16 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee { if (!entity.TryGetComponent(out StunnableComponent stunnable)) continue; - if(_robustRandom.Prob(_paralyzeChance)) - stunnable.Paralyze(_paralyzeTime); + if(!stunnable.SlowedDown) + if(_robustRandom.Prob(_paralyzeChanceNoSlowdown)) + stunnable.Paralyze(_paralyzeTime); + else + stunnable.Slowdown(_slowdownTime); else - stunnable.Slowdown(_slowdownTime); + if(_robustRandom.Prob(_paralyzeChanceWithSlowdown)) + stunnable.Paralyze(_paralyzeTime); + else + stunnable.Slowdown(_slowdownTime); } cell.DeductCharge(EnergyPerUse); @@ -252,6 +263,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee { protected override void GetData(IEntity user, StunbatonComponent component, VerbData data) { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + if (component.Cell == null) { data.Text = "Eject cell (cell missing)"; diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs new file mode 100644 index 0000000000..9841f283a0 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameObjects; + +namespace Content.Server.GameObjects.Components.Weapon.Melee +{ + [RegisterComponent] + public class UnarmedCombatComponent : MeleeWeaponComponent + { + public override string Name => "UnarmedCombat"; + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs new file mode 100644 index 0000000000..9d7d6a869d --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs @@ -0,0 +1,227 @@ +using System; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.Audio; +using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Maths; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition +{ + [RegisterComponent] + public sealed class AmmoBoxComponent : Component, IInteractUsing, IUse, IInteractHand, IMapInit + { + public override string Name => "AmmoBox"; + + private BallisticCaliber _caliber; + public int Capacity => _capacity; + private int _capacity; + + public int AmmoLeft => _spawnedAmmo.Count + _unspawnedCount; + private Stack _spawnedAmmo; + private Container _ammoContainer; + private int _unspawnedCount; + + private string _fillPrototype; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _capacity, "capacity", 30); + serializer.DataField(ref _fillPrototype, "fillPrototype", null); + + _spawnedAmmo = new Stack(_capacity); + } + + public override void Initialize() + { + base.Initialize(); + _ammoContainer = ContainerManagerComponent.Ensure($"{Name}-container", Owner, out var existing); + + if (existing) + { + foreach (var entity in _ammoContainer.ContainedEntities) + { + _unspawnedCount--; + _spawnedAmmo.Push(entity); + _ammoContainer.Insert(entity); + } + } + + } + + void IMapInit.MapInit() + { + _unspawnedCount += _capacity; + UpdateAppearance(); + } + + private void UpdateAppearance() + { + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + appearanceComponent.SetData(MagazineBarrelVisuals.MagLoaded, true); + appearanceComponent.SetData(AmmoVisuals.AmmoCount, AmmoLeft); + appearanceComponent.SetData(AmmoVisuals.AmmoMax, _capacity); + } + } + + public IEntity TakeAmmo() + { + if (_spawnedAmmo.TryPop(out IEntity ammo)) + { + _ammoContainer.Remove(ammo); + return ammo; + } + + if (_unspawnedCount > 0) + { + ammo = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.GridPosition); + _unspawnedCount--; + } + + return ammo; + } + + public bool TryInsertAmmo(IEntity user, IEntity entity) + { + if (!entity.TryGetComponent(out AmmoComponent ammoComponent)) + { + return false; + } + + if (ammoComponent.Caliber != _caliber) + { + Owner.PopupMessage(user, Loc.GetString("Wrong caliber")); + return false; + } + + if (AmmoLeft >= Capacity) + { + Owner.PopupMessage(user, Loc.GetString("No room")); + return false; + } + + _spawnedAmmo.Push(entity); + _ammoContainer.Insert(entity); + UpdateAppearance(); + return true; + } + + bool IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) + { + if (eventArgs.Using.HasComponent()) + { + return TryInsertAmmo(eventArgs.User, eventArgs.Using); + } + + if (eventArgs.Using.TryGetComponent(out RangedMagazineComponent rangedMagazine)) + { + for (var i = 0; i < Math.Max(10, rangedMagazine.ShotsLeft); i++) + { + var ammo = rangedMagazine.TakeAmmo(); + + if (!TryInsertAmmo(eventArgs.User, ammo)) + { + rangedMagazine.TryInsertAmmo(eventArgs.User, ammo); + return true; + } + } + + return true; + } + + return false; + } + + private bool TryUse(IEntity user) + { + if (!user.TryGetComponent(out HandsComponent handsComponent)) + { + return false; + } + + var ammo = TakeAmmo(); + var itemComponent = ammo.GetComponent(); + + if (!handsComponent.CanPutInHand(itemComponent)) + { + TryInsertAmmo(user, ammo); + return false; + } + + handsComponent.PutInHand(itemComponent); + UpdateAppearance(); + return true; + } + + private void EjectContents(int count) + { + var ejectCount = Math.Min(count, Capacity); + var ejectAmmo = new List(ejectCount); + + for (var i = 0; i < Math.Min(count, Capacity); i++) + { + var ammo = TakeAmmo(); + if (ammo == null) + { + break; + } + + ejectAmmo.Add(ammo); + } + + ServerRangedBarrelComponent.EjectCasings(ejectAmmo); + UpdateAppearance(); + } + + bool IUse.UseEntity(UseEntityEventArgs eventArgs) + { + return TryUse(eventArgs.User); + } + + bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs) + { + return TryUse(eventArgs.User); + } + + // So if you have 200 rounds in a box and that suddenly creates 200 entities you're not having a fun time + [Verb] + private sealed class DumpVerb : Verb + { + protected override void GetData(IEntity user, AmmoBoxComponent component, VerbData data) + { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Text = Loc.GetString("Dump 10"); + data.Visibility = component.AmmoLeft > 0 ? VerbVisibility.Visible : VerbVisibility.Disabled; + } + + protected override void Activate(IEntity user, AmmoBoxComponent component) + { + component.EjectContents(10); + } + } + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs new file mode 100644 index 0000000000..b7fb82d9de --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs @@ -0,0 +1,176 @@ +using System; +using System.Timers; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; +using Logger = Robust.Shared.Log.Logger; +using Timer = Robust.Shared.Timers.Timer; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition +{ + /// + /// Allows this entity to be loaded into a ranged weapon (if the caliber matches) + /// Generally used for bullets but can be used for other things like bananas + /// + [RegisterComponent] + public class AmmoComponent : Component + { + public override string Name => "Ammo"; + public BallisticCaliber Caliber => _caliber; + private BallisticCaliber _caliber; + public bool Spent + { + get + { + if (_ammoIsProjectile) + { + return false; + } + + return _spent; + } + } + private bool _spent; + + /// + /// Used for anything without a case that fires itself + /// + private bool _ammoIsProjectile; + + /// + /// Used for something that is deleted when the projectile is retrieved + /// + public bool Caseless => _caseless; + private bool _caseless; + // Rather than managing bullet / case state seemed easier to just have 2 toggles + // ammoIsProjectile being for a beanbag for example and caseless being for ClRifle rounds + + /// + /// For shotguns where they might shoot multiple entities + /// + public int ProjectilesFired => _projectilesFired; + private int _projectilesFired; + private string _projectileId; + // How far apart each entity is if multiple are shot + public float EvenSpreadAngle => _evenSpreadAngle; + private float _evenSpreadAngle; + /// + /// How fast the shot entities travel + /// + public float Velocity => _velocity; + private float _velocity; + + private string _muzzleFlashSprite; + + public string SoundCollectionEject => _soundCollectionEject; + private string _soundCollectionEject; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + // For shotty of whatever as well + serializer.DataField(ref _projectileId, "projectile", null); + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _projectilesFired, "projectilesFired", 1); + // Used for shotty to determine overall pellet spread + serializer.DataField(ref _evenSpreadAngle, "ammoSpread", 0); + serializer.DataField(ref _velocity, "ammoVelocity", 20.0f); + serializer.DataField(ref _ammoIsProjectile, "isProjectile", false); + serializer.DataField(ref _caseless, "caseless", false); + // Being both caseless and shooting yourself doesn't make sense + DebugTools.Assert(!(_ammoIsProjectile && _caseless)); + serializer.DataField(ref _muzzleFlashSprite, "muzzleFlash", "Objects/Guns/Projectiles/bullet_muzzle.png"); + serializer.DataField(ref _soundCollectionEject, "soundCollectionEject", "CasingEject"); + + if (_projectilesFired < 1) + { + Logger.Error("Ammo can't have less than 1 projectile"); + } + + if (_evenSpreadAngle > 0 && _projectilesFired == 1) + { + Logger.Error("Can't have an even spread if only 1 projectile is fired"); + throw new InvalidOperationException(); + } + } + + public IEntity TakeBullet() + { + if (_ammoIsProjectile) + { + return Owner; + } + + if (_spent) + { + return null; + } + + _spent = true; + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + appearanceComponent.SetData(AmmoVisuals.Spent, true); + } + + var entity = Owner.EntityManager.SpawnEntity(_projectileId, Owner.Transform.GridPosition); + DebugTools.AssertNotNull(entity); + return entity; + } + + public void MuzzleFlash(GridCoordinates grid, Angle angle) + { + if (_muzzleFlashSprite == null) + { + return; + } + + var time = IoCManager.Resolve().CurTime; + var deathTime = time + TimeSpan.FromMilliseconds(200); + // Offset the sprite so it actually looks like it's coming from the gun + var offset = angle.ToVec().Normalized / 2; + + var message = new EffectSystemMessage + { + EffectSprite = _muzzleFlashSprite, + Born = time, + DeathTime = deathTime, + Coordinates = grid.Translated(offset), + //Rotated from east facing + Rotation = (float) angle.Theta, + Color = Vector4.Multiply(new Vector4(255, 255, 255, 255), 1.0f), + ColorDelta = new Vector4(0, 0, 0, -1500f), + Shaded = false + }; + EntitySystem.Get().CreateParticle(message); + } + } + + public enum BallisticCaliber + { + Unspecified = 0, + A357, // Placeholder? + ClRifle, + SRifle, + Pistol, + A35, // Placeholder? + LRifle, + Magnum, + AntiMaterial, + Shotgun, + Cap, // Placeholder + Rocket, + Dart, // Placeholder + Grenade, + Energy, + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs new file mode 100644 index 0000000000..92393e4d31 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs @@ -0,0 +1,176 @@ +using System; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.Audio; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.Interfaces; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition +{ + [RegisterComponent] + public class RangedMagazineComponent : Component, IMapInit, IInteractUsing, IUse + { + public override string Name => "RangedMagazine"; + + private Stack _spawnedAmmo = new Stack(); + private Container _ammoContainer; + + public int ShotsLeft => _spawnedAmmo.Count + _unspawnedCount; + public int Capacity => _capacity; + private int _capacity; + + public MagazineType MagazineType => _magazineType; + private MagazineType _magazineType; + public BallisticCaliber Caliber => _caliber; + private BallisticCaliber _caliber; + + private AppearanceComponent _appearanceComponent; + + // If there's anything already in the magazine + private string _fillPrototype; + // By default the magazine won't spawn the entity until needed so we need to keep track of how many left we can spawn + // Generally you probablt don't want to use this + private int _unspawnedCount; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _magazineType, "magazineType", MagazineType.Unspecified); + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _fillPrototype, "fillPrototype", null); + serializer.DataField(ref _capacity, "capacity", 20); + } + + void IMapInit.MapInit() + { + if (_fillPrototype != null) + { + _unspawnedCount += Capacity; + } + UpdateAppearance(); + } + + public override void Initialize() + { + base.Initialize(); + _ammoContainer = ContainerManagerComponent.Ensure($"{Name}-magazine", Owner, out var existing); + + if (existing) + { + if (_ammoContainer.ContainedEntities.Count > Capacity) + { + throw new InvalidOperationException("Initialized capacity of magazine higher than its actual capacity"); + } + + foreach (var entity in _ammoContainer.ContainedEntities) + { + _spawnedAmmo.Push(entity); + _unspawnedCount--; + } + } + + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + _appearanceComponent = appearanceComponent; + } + + _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, true); + } + + private void UpdateAppearance() + { + _appearanceComponent?.SetData(AmmoVisuals.AmmoCount, ShotsLeft); + _appearanceComponent?.SetData(AmmoVisuals.AmmoMax, Capacity); + } + + public bool TryInsertAmmo(IEntity user, IEntity ammo) + { + if (!ammo.TryGetComponent(out AmmoComponent ammoComponent)) + { + return false; + } + + if (ammoComponent.Caliber != _caliber) + { + Owner.PopupMessage(user, Loc.GetString("Wrong caliber")); + return false; + } + + if (ShotsLeft >= Capacity) + { + Owner.PopupMessage(user, Loc.GetString("Magazine is full")); + return false; + } + + _ammoContainer.Insert(ammo); + _spawnedAmmo.Push(ammo); + UpdateAppearance(); + return true; + } + + public IEntity TakeAmmo() + { + IEntity ammo = null; + // If anything's spawned use that first, otherwise use the fill prototype as a fallback (if we have spawn count left) + if (_spawnedAmmo.TryPop(out var entity)) + { + ammo = entity; + _ammoContainer.Remove(entity); + } + else if (_unspawnedCount > 0) + { + _unspawnedCount--; + ammo = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.GridPosition); + } + + UpdateAppearance(); + return ammo; + } + + bool IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) + { + return TryInsertAmmo(eventArgs.User, eventArgs.Using); + } + + bool IUse.UseEntity(UseEntityEventArgs eventArgs) + { + if (!eventArgs.User.TryGetComponent(out HandsComponent handsComponent)) + { + return false; + } + + var ammo = TakeAmmo(); + if (ammo == null) + { + return false; + } + + var itemComponent = ammo.GetComponent(); + if (!handsComponent.CanPutInHand(itemComponent)) + { + ammo.Transform.GridPosition = eventArgs.User.Transform.GridPosition; + ServerRangedBarrelComponent.EjectCasing(ammo); + } + else + { + handsComponent.PutInHand(itemComponent); + } + + return true; + } + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs new file mode 100644 index 0000000000..89cceb6828 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs @@ -0,0 +1,215 @@ +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.Interfaces; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Localization; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition +{ + /// + /// Used to load certain ranged weapons quickly + /// + [RegisterComponent] + public class SpeedLoaderComponent : Component, IAfterInteract, IInteractUsing, IMapInit, IUse + { + public override string Name => "SpeedLoader"; + + private BallisticCaliber _caliber; + public int Capacity => _capacity; + private int _capacity; + private Container _ammoContainer; + private Stack _spawnedAmmo; + private int _unspawnedCount; + + public int AmmoLeft => _spawnedAmmo.Count + _unspawnedCount; + + private string _fillPrototype; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _capacity, "capacity", 6); + serializer.DataField(ref _fillPrototype, "fillPrototype", null); + + _spawnedAmmo = new Stack(_capacity); + } + + public override void Initialize() + { + base.Initialize(); + _ammoContainer = ContainerManagerComponent.Ensure($"{Name}-container", Owner, out var existing); + + if (existing) + { + foreach (var ammo in _ammoContainer.ContainedEntities) + { + _unspawnedCount--; + _spawnedAmmo.Push(ammo); + } + } + } + + void IMapInit.MapInit() + { + _unspawnedCount += _capacity; + UpdateAppearance(); + } + + private void UpdateAppearance() + { + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, true); + appearanceComponent?.SetData(AmmoVisuals.AmmoCount, AmmoLeft); + appearanceComponent?.SetData(AmmoVisuals.AmmoMax, Capacity); + } + } + + public bool TryInsertAmmo(IEntity user, IEntity entity) + { + if (!entity.TryGetComponent(out AmmoComponent ammoComponent)) + { + return false; + } + + if (ammoComponent.Caliber != _caliber) + { + Owner.PopupMessage(user, Loc.GetString("Wrong caliber")); + return false; + } + + if (AmmoLeft >= Capacity) + { + Owner.PopupMessage(user, Loc.GetString("No room")); + return false; + } + + _spawnedAmmo.Push(entity); + _ammoContainer.Insert(entity); + UpdateAppearance(); + return true; + + } + + private bool UseEntity(IEntity user) + { + if (!user.TryGetComponent(out HandsComponent handsComponent)) + { + return false; + } + + var ammo = TakeAmmo(); + if (ammo == null) + { + return false; + } + + var itemComponent = ammo.GetComponent(); + if (!handsComponent.CanPutInHand(itemComponent)) + { + ServerRangedBarrelComponent.EjectCasing(ammo); + } + else + { + handsComponent.PutInHand(itemComponent); + } + + UpdateAppearance(); + return true; + } + + private IEntity TakeAmmo() + { + if (_spawnedAmmo.TryPop(out var entity)) + { + _ammoContainer.Remove(entity); + return entity; + } + + if (_unspawnedCount > 0) + { + entity = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.GridPosition); + _unspawnedCount--; + } + + return entity; + } + + void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs) + { + if (eventArgs.Target == null) + { + return; + } + + // This area is dirty but not sure of an easier way to do it besides add an interface or somethin + bool changed = false; + + if (eventArgs.Target.TryGetComponent(out RevolverBarrelComponent revolverBarrel)) + { + for (var i = 0; i < Capacity; i++) + { + var ammo = TakeAmmo(); + if (ammo == null) + { + break; + } + + if (revolverBarrel.TryInsertBullet(eventArgs.User, ammo)) + { + changed = true; + continue; + } + + // Take the ammo back + TryInsertAmmo(eventArgs.User, ammo); + break; + } + } else if (eventArgs.Target.TryGetComponent(out BoltActionBarrelComponent boltActionBarrel)) + { + for (var i = 0; i < Capacity; i++) + { + var ammo = TakeAmmo(); + if (ammo == null) + { + break; + } + + if (boltActionBarrel.TryInsertBullet(eventArgs.User, ammo)) + { + changed = true; + continue; + } + + // Take the ammo back + TryInsertAmmo(eventArgs.User, ammo); + break; + } + + } + + if (changed) + { + UpdateAppearance(); + } + } + + bool IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) + { + return TryInsertAmmo(eventArgs.User, eventArgs.Using); + } + + bool IUse.UseEntity(UseEntityEventArgs eventArgs) + { + return UseEntity(eventArgs.User); + } + } +} \ No newline at end of file diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs new file mode 100644 index 0000000000..4b3fcbc838 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs @@ -0,0 +1,335 @@ +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Sound; +using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.Containers; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels +{ + /// + /// Shotguns mostly + /// + [RegisterComponent] + public sealed class BoltActionBarrelComponent : ServerRangedBarrelComponent, IMapInit + { + // Originally I had this logic shared with PumpBarrel and used a couple of variables to control things + // but it felt a lot messier to play around with, especially when adding verbs + + public override string Name => "BoltActionBarrel"; + + public override int ShotsLeft + { + get + { + var chamberCount = _chamberContainer.ContainedEntity != null ? 1 : 0; + return chamberCount + _spawnedAmmo.Count + _unspawnedCount; + } + } + public override int Capacity => _capacity; + private int _capacity; + + private ContainerSlot _chamberContainer; + private Stack _spawnedAmmo; + private Container _ammoContainer; + + private BallisticCaliber _caliber; + + private string _fillPrototype; + private int _unspawnedCount; + + public bool BoltOpen + { + get => _boltOpen; + set + { + if (_boltOpen == value) + { + return; + } + + var soundSystem = EntitySystem.Get(); + + if (value) + { + if (_soundBoltOpen != null) + { + soundSystem.PlayAtCoords(_soundBoltOpen, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + } + else + { + if (_soundBoltClosed != null) + { + soundSystem.PlayAtCoords(_soundBoltClosed, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + } + + _boltOpen = value; + UpdateAppearance(); + } + } + private bool _boltOpen; + private bool _autoCycle; + + private AppearanceComponent _appearanceComponent; + // Sounds + private string _soundCycle; + private string _soundBoltOpen; + private string _soundBoltClosed; + private string _soundInsert; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _capacity, "capacity", 6); + serializer.DataField(ref _fillPrototype, "fillPrototype", null); + serializer.DataField(ref _autoCycle, "autoCycle", false); + + serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Guns/Cock/sf_rifle_cock.ogg"); + serializer.DataField(ref _soundBoltOpen, "soundBoltOpen", "/Audio/Guns/Bolt/rifle_bolt_open.ogg"); + serializer.DataField(ref _soundBoltClosed, "soundBoltClosed", "/Audio/Guns/Bolt/rifle_bolt_closed.ogg"); + serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/bullet_insert.ogg"); + } + + void IMapInit.MapInit() + { + if (_fillPrototype != null) + { + _unspawnedCount += Capacity - 1; + } + UpdateAppearance(); + } + + public override void Initialize() + { + // TODO: Add existing ammo support on revolvers + base.Initialize(); + _spawnedAmmo = new Stack(_capacity - 1); + _ammoContainer = ContainerManagerComponent.Ensure($"{Name}-ammo-container", Owner, out var existing); + + if (existing) + { + foreach (var entity in _ammoContainer.ContainedEntities) + { + _spawnedAmmo.Push(entity); + _unspawnedCount--; + } + } + + _chamberContainer = ContainerManagerComponent.Ensure($"{Name}-chamber-container", Owner); + + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + _appearanceComponent = appearanceComponent; + } + + _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, true); + UpdateAppearance(); + } + + private void UpdateAppearance() + { + _appearanceComponent?.SetData(BarrelBoltVisuals.BoltOpen, BoltOpen); + _appearanceComponent?.SetData(AmmoVisuals.AmmoCount, ShotsLeft); + _appearanceComponent?.SetData(AmmoVisuals.AmmoMax, Capacity); + } + + public override IEntity PeekAmmo() + { + return _chamberContainer.ContainedEntity; + } + + public override IEntity TakeProjectile() + { + var chamberEntity = _chamberContainer.ContainedEntity; + if (_autoCycle) + { + Cycle(); + } + return chamberEntity?.GetComponent().TakeBullet(); + } + + protected override bool WeaponCanFire() + { + if (!base.WeaponCanFire()) + { + return false; + } + + return !BoltOpen && _chamberContainer.ContainedEntity != null; + } + + private void Cycle(bool manual = false) + { + var chamberedEntity = _chamberContainer.ContainedEntity; + if (chamberedEntity != null) + { + _chamberContainer.Remove(chamberedEntity); + var ammoComponent = chamberedEntity.GetComponent(); + if (!ammoComponent.Caseless) + { + EjectCasing(chamberedEntity); + } + } + + if (_spawnedAmmo.TryPop(out var next)) + { + _ammoContainer.Remove(next); + _chamberContainer.Insert(next); + } + + if (_unspawnedCount > 0) + { + _unspawnedCount--; + var ammoEntity = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.GridPosition); + _chamberContainer.Insert(ammoEntity); + } + + if (_chamberContainer.ContainedEntity == null && manual) + { + BoltOpen = true; + if (ContainerHelpers.TryGetContainer(Owner, out var container)) + { + Owner.PopupMessage(container.Owner, Loc.GetString("Bolt opened")); + } + } + + if (manual) + { + if (_soundCycle != null) + { + EntitySystem.Get().PlayAtCoords(_soundCycle, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + } + + Dirty(); + UpdateAppearance(); + } + + public bool TryInsertBullet(IEntity user, IEntity ammo) + { + if (!ammo.TryGetComponent(out AmmoComponent ammoComponent)) + { + return false; + } + + if (ammoComponent.Caliber != _caliber) + { + Owner.PopupMessage(user, Loc.GetString("Wrong caliber")); + return false; + } + + if (!BoltOpen) + { + Owner.PopupMessage(user, Loc.GetString("Bolt isn't open")); + return false; + } + + if (_chamberContainer.ContainedEntity == null) + { + _chamberContainer.Insert(ammo); + if (_soundInsert != null) + { + EntitySystem.Get().PlayAtCoords(_soundInsert, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + // Dirty(); + UpdateAppearance(); + return true; + } + + if (_ammoContainer.ContainedEntities.Count < Capacity - 1) + { + _ammoContainer.Insert(ammo); + _spawnedAmmo.Push(ammo); + if (_soundInsert != null) + { + EntitySystem.Get().PlayAtCoords(_soundInsert, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + // Dirty(); + UpdateAppearance(); + return true; + } + + Owner.PopupMessage(user, Loc.GetString("No room")); + + return false; + } + + public override bool UseEntity(UseEntityEventArgs eventArgs) + { + if (BoltOpen) + { + BoltOpen = false; + Owner.PopupMessage(eventArgs.User, Loc.GetString("Bolt closed")); + // Dirty(); + return true; + } + + Cycle(true); + return true; + } + + public override bool InteractUsing(InteractUsingEventArgs eventArgs) + { + return TryInsertBullet(eventArgs.User, eventArgs.Using); + } + + [Verb] + private sealed class OpenBoltVerb : Verb + { + protected override void GetData(IEntity user, BoltActionBarrelComponent component, VerbData data) + { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Text = Loc.GetString("Open bolt"); + data.Visibility = component.BoltOpen ? VerbVisibility.Disabled : VerbVisibility.Visible; + } + + protected override void Activate(IEntity user, BoltActionBarrelComponent component) + { + component.BoltOpen = true; + } + } + + [Verb] + private sealed class CloseBoltVerb : Verb + { + protected override void GetData(IEntity user, BoltActionBarrelComponent component, VerbData data) + { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Text = Loc.GetString("Close bolt"); + data.Visibility = component.BoltOpen ? VerbVisibility.Visible : VerbVisibility.Disabled; + } + + protected override void Activate(IEntity user, BoltActionBarrelComponent component) + { + component.BoltOpen = false; + } + } + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs new file mode 100644 index 0000000000..6e344e163e --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs @@ -0,0 +1,215 @@ +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Sound; +using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.Interfaces; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels +{ + /// + /// Bolt-action rifles + /// + [RegisterComponent] + public sealed class PumpBarrelComponent : ServerRangedBarrelComponent, IMapInit + { + public override string Name => "PumpBarrel"; + + public override int ShotsLeft + { + get + { + var chamberCount = _chamberContainer.ContainedEntity != null ? 1 : 0; + return chamberCount + _spawnedAmmo.Count + _unspawnedCount; + } + } + + public override int Capacity => _capacity; + private int _capacity; + + // Even a point having a chamber? I guess it makes some of the below code cleaner + private ContainerSlot _chamberContainer; + private Stack _spawnedAmmo; + private Container _ammoContainer; + + private BallisticCaliber _caliber; + + private string _fillPrototype; + private int _unspawnedCount; + + private bool _manualCycle; + + private AppearanceComponent _appearanceComponent; + + // Sounds + private string _soundCycle; + private string _soundInsert; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _capacity, "capacity", 6); + serializer.DataField(ref _fillPrototype, "fillPrototype", null); + serializer.DataField(ref _manualCycle, "manualCycle", true); + + serializer.DataField(ref _soundCycle, "soundCycle", "/Audio/Guns/Cock/sf_rifle_cock.ogg"); + serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/bullet_insert.ogg"); + + _spawnedAmmo = new Stack(_capacity - 1); + } + + void IMapInit.MapInit() + { + if (_fillPrototype != null) + { + _unspawnedCount += Capacity - 1; + } + UpdateAppearance(); + } + + public override void Initialize() + { + base.Initialize(); + + _ammoContainer = + ContainerManagerComponent.Ensure($"{Name}-ammo-container", Owner, out var existing); + + if (existing) + { + foreach (var entity in _ammoContainer.ContainedEntities) + { + _spawnedAmmo.Push(entity); + _unspawnedCount--; + } + } + + _chamberContainer = + ContainerManagerComponent.Ensure($"{Name}-chamber-container", Owner, out existing); + if (existing) + { + _unspawnedCount--; + } + + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + _appearanceComponent = appearanceComponent; + } + + _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, true); + UpdateAppearance(); + } + + private void UpdateAppearance() + { + _appearanceComponent?.SetData(AmmoVisuals.AmmoCount, ShotsLeft); + _appearanceComponent?.SetData(AmmoVisuals.AmmoMax, Capacity); + } + + public override IEntity PeekAmmo() + { + return _chamberContainer.ContainedEntity; + } + + public override IEntity TakeProjectile() + { + var chamberEntity = _chamberContainer.ContainedEntity; + if (!_manualCycle) + { + Cycle(); + } + return chamberEntity?.GetComponent().TakeBullet(); + } + + private void Cycle(bool manual = false) + { + var chamberedEntity = _chamberContainer.ContainedEntity; + if (chamberedEntity != null) + { + _chamberContainer.Remove(chamberedEntity); + var ammoComponent = chamberedEntity.GetComponent(); + if (!ammoComponent.Caseless) + { + EjectCasing(chamberedEntity); + } + } + + if (_spawnedAmmo.TryPop(out var next)) + { + _ammoContainer.Remove(next); + _chamberContainer.Insert(next); + } + + if (_unspawnedCount > 0) + { + _unspawnedCount--; + var ammoEntity = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.GridPosition); + _chamberContainer.Insert(ammoEntity); + } + + if (manual) + { + if (_soundCycle != null) + { + EntitySystem.Get().PlayAtCoords(_soundCycle, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + } + + // Dirty(); + UpdateAppearance(); + } + + public bool TryInsertBullet(InteractUsingEventArgs eventArgs) + { + if (!eventArgs.Using.TryGetComponent(out AmmoComponent ammoComponent)) + { + return false; + } + + if (ammoComponent.Caliber != _caliber) + { + Owner.PopupMessage(eventArgs.User, Loc.GetString("Wrong caliber")); + return false; + } + + if (_ammoContainer.ContainedEntities.Count < Capacity - 1) + { + _ammoContainer.Insert(eventArgs.Using); + _spawnedAmmo.Push(eventArgs.Using); + // Dirty(); + UpdateAppearance(); + if (_soundInsert != null) + { + EntitySystem.Get().PlayAtCoords(_soundInsert, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + return true; + } + + Owner.PopupMessage(eventArgs.User, Loc.GetString("No room")); + + return false; + } + + public override bool UseEntity(UseEntityEventArgs eventArgs) + { + Cycle(true); + return true; + } + + public override bool InteractUsing(InteractUsingEventArgs eventArgs) + { + return TryInsertBullet(eventArgs); + } + } +} \ No newline at end of file diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs new file mode 100644 index 0000000000..02e5f40a93 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs @@ -0,0 +1,248 @@ +using System; +using Content.Server.GameObjects.Components.Sound; +using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels +{ + [RegisterComponent] + public sealed class RevolverBarrelComponent : ServerRangedBarrelComponent + { + public override string Name => "RevolverBarrel"; + private BallisticCaliber _caliber; + private Container _ammoContainer; + private int _currentSlot = 0; + public override int Capacity => _ammoSlots.Length; + private IEntity[] _ammoSlots; + + public override int ShotsLeft => _ammoContainer.ContainedEntities.Count; + + private AppearanceComponent _appearanceComponent; + + // Sounds + private string _soundEject; + private string _soundInsert; + private string _soundSpin; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + + if (serializer.Reading) + { + var capacity = serializer.ReadDataField("capacity", 6); + _ammoSlots = new IEntity[capacity]; + } + + // TODO: Writing? + + + // Sounds + serializer.DataField(ref _soundEject, "soundEject", "/Audio/Guns/MagOut/revolver_magout.ogg"); + serializer.DataField(ref _soundInsert, "soundInsert", "/Audio/Guns/MagIn/revolver_magin.ogg"); + serializer.DataField(ref _soundSpin, "soundSpin", "/Audio/Guns/Misc/revolver_spin.ogg"); + } + + public override void Initialize() + { + base.Initialize(); + _ammoContainer = ContainerManagerComponent.Ensure($"{Name}-ammoContainer", Owner); + + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + _appearanceComponent = appearanceComponent; + } + + _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, true); + } + + private void UpdateAppearance() + { + // Placeholder, at this stage it's just here for the RPG + _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, ShotsLeft > 0); + _appearanceComponent?.SetData(AmmoVisuals.AmmoCount, ShotsLeft); + _appearanceComponent?.SetData(AmmoVisuals.AmmoMax, Capacity); + } + + public bool TryInsertBullet(IEntity user, IEntity entity) + { + if (!entity.TryGetComponent(out AmmoComponent ammoComponent)) + { + return false; + } + + if (ammoComponent.Caliber != _caliber) + { + Owner.PopupMessage(user, Loc.GetString("Wrong caliber")); + return false; + } + + // Functions like a stack + // These are inserted in reverse order but then when fired Cycle will go through in order + // The reason we don't just use an actual stack is because spin can select a random slot to point at + for (var i = _ammoSlots.Length - 1; i >= 0; i--) + { + var slot = _ammoSlots[i]; + if (slot == null) + { + _currentSlot = i; + _ammoSlots[i] = entity; + _ammoContainer.Insert(entity); + if (_soundInsert != null) + { + EntitySystem.Get().PlayAtCoords(_soundInsert, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + + // Dirty(); + UpdateAppearance(); + return true; + } + } + + Owner.PopupMessage(user, Loc.GetString("Ammo full")); + return false; + } + + public void Cycle() + { + // Move up a slot + _currentSlot = (_currentSlot + 1) % _ammoSlots.Length; + // Dirty(); + UpdateAppearance(); + } + + /// + /// Russian Roulette + /// + public void Spin() + { + var random = IoCManager.Resolve().Next(_ammoSlots.Length - 1); + _currentSlot = random; + if (_soundSpin != null) + { + EntitySystem.Get().PlayAtCoords(_soundSpin, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + } + + public override IEntity PeekAmmo() + { + return _ammoSlots[_currentSlot]; + } + + /// + /// Takes a projectile out if possible + /// IEnumerable just to make supporting shotguns saner + /// + /// + /// + public override IEntity TakeProjectile() + { + var ammo = _ammoSlots[_currentSlot]; + IEntity bullet = null; + if (ammo != null) + { + var ammoComponent = ammo.GetComponent(); + bullet = ammoComponent.TakeBullet(); + if (ammoComponent.Caseless) + { + _ammoSlots[_currentSlot] = null; + _ammoContainer.Remove(ammo); + } + } + Cycle(); + UpdateAppearance(); + return bullet; + } + + private void EjectAllSlots() + { + for (var i = 0; i < _ammoSlots.Length; i++) + { + var entity = _ammoSlots[i]; + if (entity == null) + { + continue; + } + + _ammoContainer.Remove(entity); + EjectCasing(entity); + _ammoSlots[i] = null; + } + + if (_ammoContainer.ContainedEntities.Count > 0) + { + if (_soundEject != null) + { + EntitySystem.Get().PlayAtCoords(_soundEject, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-1)); + } + } + + // May as well point back at the end? + _currentSlot = _ammoSlots.Length - 1; + return; + } + + /// + /// Eject all casings + /// + /// + /// + /// + public override bool UseEntity(UseEntityEventArgs eventArgs) + { + EjectAllSlots(); + //Dirty(); + UpdateAppearance(); + return true; + } + + public override bool InteractUsing(InteractUsingEventArgs eventArgs) + { + return TryInsertBullet(eventArgs.User, eventArgs.Using); + } + + [Verb] + private sealed class SpinRevolverVerb : Verb + { + protected override void GetData(IEntity user, RevolverBarrelComponent component, VerbData data) + { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Text = Loc.GetString("Spin"); + if (component.Capacity <= 1) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Visibility = component.ShotsLeft > 0 ? VerbVisibility.Visible : VerbVisibility.Disabled; + } + + protected override void Activate(IEntity user, RevolverBarrelComponent component) + { + component.Spin(); + component.Owner.PopupMessage(user, Loc.GetString("Spun the cylinder")); + } + } + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs new file mode 100644 index 0000000000..9d49d30257 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs @@ -0,0 +1,274 @@ +using System; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Power; +using Content.Server.GameObjects.Components.Projectiles; +using Content.Server.GameObjects.Components.Sound; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; +using Logger = Robust.Shared.Log.Logger; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels +{ + [RegisterComponent] + public sealed class ServerBatteryBarrelComponent : ServerRangedBarrelComponent + { + public override string Name => "BatteryBarrel"; + + // The minimum change we need before we can fire + [ViewVariables] private float _lowerChargeLimit; + [ViewVariables] private int _baseFireCost; + // What gets fired + [ViewVariables] private string _ammoPrototype; + + [ViewVariables] public IEntity PowerCellEntity => _powerCellContainer.ContainedEntity; + public PowerCellComponent PowerCell => _powerCellContainer.ContainedEntity.GetComponent(); + private ContainerSlot _powerCellContainer; + private ContainerSlot _ammoContainer; + private string _powerCellPrototype; + [ViewVariables] private bool _powerCellRemovable; + + public override int ShotsLeft + { + get + { + var powerCell = _powerCellContainer.ContainedEntity; + + if (powerCell == null) + { + return 0; + } + + return (int) Math.Ceiling(powerCell.GetComponent().Charge / _baseFireCost); + } + } + + public override int Capacity + { + get + { + var powerCell = _powerCellContainer.ContainedEntity; + + if (powerCell == null) + { + return 0; + } + + return (int) Math.Ceiling(powerCell.GetComponent().Capacity / _baseFireCost); + } + } + + private AppearanceComponent _appearanceComponent; + + // Sounds + private string _soundPowerCellInsert; + private string _soundPowerCellEject; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + if (serializer.Reading) + { + _powerCellPrototype = serializer.ReadDataField("powerCellPrototype", null); + } + + serializer.DataField(ref _powerCellRemovable, "powerCellRemovable", false); + serializer.DataField(ref _baseFireCost, "fireCost", 300); + serializer.DataField(ref _ammoPrototype, "ammoPrototype", null); + serializer.DataField(ref _lowerChargeLimit, "lowerChargeLimit", 10); + serializer.DataField(ref _soundPowerCellInsert, "soundPowerCellInsert", null); + serializer.DataField(ref _soundPowerCellEject, "soundPowerCellEject", null); + } + + public override void Initialize() + { + base.Initialize(); + _powerCellContainer = ContainerManagerComponent.Ensure($"{Name}-powercell-container", Owner, out var existing); + if (!existing && _powerCellPrototype != null) + { + var powerCellEntity = Owner.EntityManager.SpawnEntity(_powerCellPrototype, Owner.Transform.GridPosition); + _powerCellContainer.Insert(powerCellEntity); + } + + if (_ammoPrototype != null) + { + _ammoContainer = ContainerManagerComponent.Ensure($"{Name}-ammo-container", Owner); + } + + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + _appearanceComponent = appearanceComponent; + } + + UpdateAppearance(); + } + + public void UpdateAppearance() + { + _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, _powerCellContainer.ContainedEntity != null); + _appearanceComponent?.SetData(AmmoVisuals.AmmoCount, ShotsLeft); + _appearanceComponent?.SetData(AmmoVisuals.AmmoMax, Capacity); + } + + public override IEntity PeekAmmo() + { + // Spawn a dummy entity because it's easier to work with I guess + // This will get re-used for the projectile + var ammo = _ammoContainer.ContainedEntity; + if (ammo == null) + { + ammo = Owner.EntityManager.SpawnEntity(_ammoPrototype, Owner.Transform.GridPosition); + _ammoContainer.Insert(ammo); + } + + return ammo; + } + + public override IEntity TakeProjectile() + { + var powerCellEntity = _powerCellContainer.ContainedEntity; + + if (powerCellEntity == null) + { + return null; + } + + var capacitor = powerCellEntity.GetComponent(); + if (capacitor.Charge < _lowerChargeLimit) + { + return null; + } + + // Can fire confirmed + // Multiply the entity's damage / whatever by the percentage of charge the shot has. + IEntity entity; + var chargeChange = Math.Min(capacitor.Charge, _baseFireCost); + capacitor.DeductCharge(chargeChange); + var energyRatio = chargeChange / _baseFireCost; + + if (_ammoContainer.ContainedEntity != null) + { + entity = _ammoContainer.ContainedEntity; + _ammoContainer.Remove(entity); + } + else + { + entity = Owner.EntityManager.SpawnEntity(_ammoPrototype, Owner.Transform.GridPosition); + } + + if (entity.TryGetComponent(out ProjectileComponent projectileComponent)) + { + if (energyRatio < 1.0) + { + var newDamages = new Dictionary(projectileComponent.Damages.Count); + foreach (var (damageType, damage) in projectileComponent.Damages) + { + newDamages.Add(damageType, (int) (damage * energyRatio)); + } + + projectileComponent.Damages = newDamages; + } + } else if (entity.TryGetComponent(out HitscanComponent hitscanComponent)) + { + hitscanComponent.Damage *= energyRatio; + hitscanComponent.ColorModifier = energyRatio; + } + else + { + throw new InvalidOperationException("Ammo doesn't have hitscan or projectile?"); + } + + UpdateAppearance(); + //Dirty(); + return entity; + } + + public bool TryInsertPowerCell(IEntity entity) + { + if (_powerCellContainer.ContainedEntity != null) + { + return false; + } + + if (!entity.HasComponent()) + { + return false; + } + + if (_soundPowerCellInsert != null) + { + EntitySystem.Get().PlayAtCoords(_soundPowerCellInsert, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + + _powerCellContainer.Insert(entity); + UpdateAppearance(); + //Dirty(); + return true; + } + + private IEntity RemovePowerCell() + { + if (!_powerCellRemovable || _powerCellContainer.ContainedEntity == null) + { + return null; + } + + var entity = _powerCellContainer.ContainedEntity; + _powerCellContainer.Remove(entity); + if (_soundPowerCellEject != null) + { + EntitySystem.Get().PlayAtCoords(_soundPowerCellEject, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + + UpdateAppearance(); + //Dirty(); + return entity; + } + + public override bool UseEntity(UseEntityEventArgs eventArgs) + { + if (!_powerCellRemovable) + { + return false; + } + + if (!eventArgs.User.TryGetComponent(out HandsComponent handsComponent) || + PowerCellEntity == null) + { + return false; + } + + var itemComponent = PowerCellEntity.GetComponent(); + if (!handsComponent.CanPutInHand(itemComponent)) + { + return false; + } + + var powerCell = RemovePowerCell(); + handsComponent.PutInHand(itemComponent); + powerCell.Transform.GridPosition = eventArgs.User.Transform.GridPosition; + + return true; + } + + public override bool InteractUsing(InteractUsingEventArgs eventArgs) + { + if (!eventArgs.Using.HasComponent()) + { + return false; + } + + return TryInsertPowerCell(eventArgs.Using); + } + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs new file mode 100644 index 0000000000..e81c2b7ea4 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs @@ -0,0 +1,478 @@ +using System; +using System.Collections.Generic; +using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.GameObjects; +using Content.Shared.GameObjects.Components.Weapons.Ranged; +using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels; +using Content.Shared.GameObjects.EntitySystems; +using Content.Shared.Interfaces; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.Containers; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels +{ + [RegisterComponent] + public sealed class ServerMagazineBarrelComponent : ServerRangedBarrelComponent + { + public override string Name => "MagazineBarrel"; + public override uint? NetID => ContentNetIDs.MAGAZINE_BARREL; + + private ContainerSlot _chamberContainer; + [ViewVariables] public bool HasMagazine => _magazineContainer.ContainedEntity != null; + private ContainerSlot _magazineContainer; + + [ViewVariables] public MagazineType MagazineTypes => _magazineTypes; + private MagazineType _magazineTypes; + [ViewVariables] public BallisticCaliber Caliber => _caliber; + private BallisticCaliber _caliber; + + public override int ShotsLeft + { + get + { + var count = 0; + if (_chamberContainer.ContainedEntity != null) + { + count++; + } + + var magazine = _magazineContainer.ContainedEntity; + if (magazine != null) + { + count += magazine.GetComponent().ShotsLeft; + } + + return count; + } + } + + public override int Capacity + { + get + { + // Chamber + var count = 1; + var magazine = _magazineContainer.ContainedEntity; + if (magazine != null) + { + count += magazine.GetComponent().Capacity; + } + + return count; + } + } + + public bool BoltOpen { get; private set; } = true; + private bool _autoEjectMag; + // If the bolt needs to be open before we can insert / remove the mag (i.e. for LMGs) + public bool MagNeedsOpenBolt => _magNeedsOpenBolt; + private bool _magNeedsOpenBolt; + + private AppearanceComponent _appearanceComponent; + + // Sounds + private string _soundBoltOpen; + private string _soundBoltClosed; + private string _soundRack; + private string _soundMagInsert; + private string _soundMagEject; + private string _soundAutoEject; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + if (serializer.Reading) + { + var magTypes = serializer.ReadDataField("magazineTypes", new List()); + foreach (var mag in magTypes) + { + _magazineTypes |= mag; + } + } + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _autoEjectMag, "autoEjectMag", false); + serializer.DataField(ref _magNeedsOpenBolt, "magNeedsOpenBolt", false); + serializer.DataField(ref _soundBoltOpen, "soundBoltOpen", null); + serializer.DataField(ref _soundBoltClosed, "soundBoltClosed", null); + serializer.DataField(ref _soundRack, "soundRack", null); + serializer.DataField(ref _soundMagInsert, "soundMagInsert", null); + serializer.DataField(ref _soundMagEject, "soundMagEject", null); + serializer.DataField(ref _soundAutoEject, "soundAutoEject", "/Audio/Guns/EmptyAlarm/smg_empty_alarm.ogg"); + } + + public override ComponentState GetComponentState() + { + (int, int)? count = null; + var magazine = _magazineContainer.ContainedEntity; + if (magazine != null && magazine.TryGetComponent(out RangedMagazineComponent rangedMagazineComponent)) + { + count = (rangedMagazineComponent.ShotsLeft, rangedMagazineComponent.Capacity); + } + + return new MagazineBarrelComponentState( + _chamberContainer.ContainedEntity != null, + FireRateSelector, + count, + SoundGunshot); + } + + public override void Initialize() + { + base.Initialize(); + + if (Owner.TryGetComponent(out AppearanceComponent appearanceComponent)) + { + _appearanceComponent = appearanceComponent; + } + + _chamberContainer = ContainerManagerComponent.Ensure($"{Name}-chamber", Owner); + _magazineContainer = ContainerManagerComponent.Ensure($"{Name}-magazine", Owner); + } + + public void ToggleBolt() + { + // For magazines only when we normally set BoltOpen we'll defer the UpdateAppearance until everything is done + // Whereas this will just call it straight up. + BoltOpen = !BoltOpen; + var soundSystem = EntitySystem.Get(); + if (BoltOpen) + { + if (_soundBoltOpen != null) + { + soundSystem.PlayAtCoords(_soundBoltOpen, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-5)); + } + } + else + { + if (_soundBoltClosed != null) + { + soundSystem.PlayAtCoords(_soundBoltClosed, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-5)); + } + } + Dirty(); + UpdateAppearance(); + } + + public override IEntity PeekAmmo() + { + return BoltOpen ? null : _chamberContainer.ContainedEntity; + } + + public override IEntity TakeProjectile() + { + if (BoltOpen) + { + return null; + } + var entity = _chamberContainer.ContainedEntity; + + Cycle(); + return entity?.GetComponent().TakeBullet(); + } + + private void Cycle(bool manual = false) + { + if (BoltOpen) + { + return; + } + + var chamberEntity = _chamberContainer.ContainedEntity; + if (chamberEntity != null) + { + _chamberContainer.Remove(chamberEntity); + var ammoComponent = chamberEntity.GetComponent(); + if (!ammoComponent.Caseless) + { + EjectCasing(chamberEntity); + } + } + + // Try and pull a round from the magazine to replace the chamber if possible + var magazine = _magazineContainer.ContainedEntity; + var nextRound = magazine?.GetComponent().TakeAmmo(); + + if (nextRound != null) + { + // If you're really into gunporn you could put a sound here + _chamberContainer.Insert(nextRound); + } + + var soundSystem = EntitySystem.Get(); + + if (_autoEjectMag && magazine != null && magazine.GetComponent().ShotsLeft == 0) + { + if (_soundAutoEject != null) + { + soundSystem.PlayAtCoords(_soundAutoEject, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + + _magazineContainer.Remove(magazine); + SendNetworkMessage(new MagazineAutoEjectMessage()); + } + + if (nextRound == null && !BoltOpen) + { + if (_soundBoltOpen != null) + { + soundSystem.PlayAtCoords(_soundBoltOpen, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-5)); + } + + if (ContainerHelpers.TryGetContainer(Owner, out var container)) + { + Owner.PopupMessage(container.Owner, Loc.GetString("Bolt open")); + } + BoltOpen = true; + Dirty(); + UpdateAppearance(); + return; + } + + if (manual) + { + if (_soundRack != null) + { + soundSystem.PlayAtCoords(_soundRack, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + } + + Dirty(); + UpdateAppearance(); + } + + private void UpdateAppearance() + { + _appearanceComponent?.SetData(BarrelBoltVisuals.BoltOpen, BoltOpen); + _appearanceComponent?.SetData(MagazineBarrelVisuals.MagLoaded, _magazineContainer.ContainedEntity != null); + _appearanceComponent?.SetData(AmmoVisuals.AmmoCount, ShotsLeft); + _appearanceComponent?.SetData(AmmoVisuals.AmmoMax, Capacity); + } + + public override bool UseEntity(UseEntityEventArgs eventArgs) + { + // Behavior: + // If bolt open just close it + // If bolt closed then cycle + // If we cycle then get next round + // If no more round then open bolt + + if (BoltOpen) + { + if (_soundBoltClosed != null) + { + EntitySystem.Get().PlayAtCoords(_soundBoltClosed, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-5)); + } + Owner.PopupMessage(eventArgs.User, Loc.GetString("Bolt closed")); + BoltOpen = false; + Dirty(); + UpdateAppearance(); + return true; + } + + // Could play a rack-slide specific sound here if you're so inclined (if the chamber is empty but rounds are available) + + Cycle(true); + return true; + } + + public void RemoveMagazine(IEntity user) + { + var mag = _magazineContainer.ContainedEntity; + + if (mag == null) + { + return; + } + + if (MagNeedsOpenBolt && !BoltOpen) + { + Owner.PopupMessage(user, Loc.GetString("Bolt needs to be open")); + return; + } + + _magazineContainer.Remove(mag); + if (_soundMagEject != null) + { + EntitySystem.Get().PlayAtCoords(_soundMagEject, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + + if (user.TryGetComponent(out HandsComponent handsComponent)) + { + handsComponent.PutInHandOrDrop(mag.GetComponent()); + } + + Dirty(); + UpdateAppearance(); + } + + public override bool InteractUsing(InteractUsingEventArgs eventArgs) + { + // Insert magazine + if (eventArgs.Using.TryGetComponent(out RangedMagazineComponent magazineComponent)) + { + if ((MagazineTypes & magazineComponent.MagazineType) == 0) + { + Owner.PopupMessage(eventArgs.User, Loc.GetString("Wrong magazine type")); + return false; + } + + if (magazineComponent.Caliber != _caliber) + { + Owner.PopupMessage(eventArgs.User, Loc.GetString("Wrong caliber")); + return false; + } + + if (_magNeedsOpenBolt && !BoltOpen) + { + Owner.PopupMessage(eventArgs.User, Loc.GetString("Need to open bolt first")); + return false; + } + + if (_magazineContainer.ContainedEntity == null) + { + if (_soundMagInsert != null) + { + EntitySystem.Get().PlayAtCoords(_soundMagInsert, Owner.Transform.GridPosition, AudioParams.Default.WithVolume(-2)); + } + Owner.PopupMessage(eventArgs.User, Loc.GetString("Magazine inserted")); + _magazineContainer.Insert(eventArgs.Using); + Dirty(); + UpdateAppearance(); + return true; + } + + Owner.PopupMessage(eventArgs.User, Loc.GetString("Already holding a magazine")); + return false; + } + + // Insert 1 ammo + if (eventArgs.Using.TryGetComponent(out AmmoComponent ammoComponent)) + { + if (!BoltOpen) + { + Owner.PopupMessage(eventArgs.User, Loc.GetString("Cannot insert ammo while bolt is closed")); + return false; + } + + if (ammoComponent.Caliber != _caliber) + { + Owner.PopupMessage(eventArgs.User, Loc.GetString("Wrong caliber")); + return false; + } + + if (_chamberContainer.ContainedEntity == null) + { + Owner.PopupMessage(eventArgs.User, Loc.GetString("Ammo inserted")); + _chamberContainer.Insert(eventArgs.Using); + Dirty(); + UpdateAppearance(); + return true; + } + + Owner.PopupMessage(eventArgs.User, Loc.GetString("Chamber full")); + return false; + } + + return false; + } + + [Verb] + private sealed class EjectMagazineVerb : Verb + { + protected override void GetData(IEntity user, ServerMagazineBarrelComponent component, VerbData data) + { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Text = Loc.GetString("Eject magazine"); + if (component.MagNeedsOpenBolt) + { + data.Visibility = component.HasMagazine && component.BoltOpen + ? VerbVisibility.Visible + : VerbVisibility.Disabled; + return; + } + + data.Visibility = component.HasMagazine ? VerbVisibility.Visible : VerbVisibility.Disabled; + } + + protected override void Activate(IEntity user, ServerMagazineBarrelComponent component) + { + component.RemoveMagazine(user); + } + } + + [Verb] + private sealed class OpenBoltVerb : Verb + { + protected override void GetData(IEntity user, ServerMagazineBarrelComponent component, VerbData data) + { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Text = Loc.GetString("Open bolt"); + data.Visibility = component.BoltOpen ? VerbVisibility.Disabled : VerbVisibility.Visible; + } + + protected override void Activate(IEntity user, ServerMagazineBarrelComponent component) + { + component.ToggleBolt(); + } + } + + [Verb] + private sealed class CloseBoltVerb : Verb + { + protected override void GetData(IEntity user, ServerMagazineBarrelComponent component, VerbData data) + { + if (!ActionBlockerSystem.CanInteract(user)) + { + data.Visibility = VerbVisibility.Invisible; + return; + } + + data.Text = Loc.GetString("Close bolt"); + data.Visibility = component.BoltOpen ? VerbVisibility.Visible : VerbVisibility.Disabled; + } + + protected override void Activate(IEntity user, ServerMagazineBarrelComponent component) + { + component.ToggleBolt(); + } + } + } + + [Flags] + public enum MagazineType + { + + Unspecified = 0, + LPistol = 1 << 0, // Placeholder? + Pistol = 1 << 1, + HCPistol = 1 << 2, + Smg = 1 << 3, + SmgTopMounted = 1 << 4, + Rifle = 1 << 5, + IH = 1 << 6, // Placeholder? + Box = 1 << 7, + Pan = 1 << 8, + Dart = 1 << 9, // Placeholder + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs new file mode 100644 index 0000000000..2690bd277e --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs @@ -0,0 +1,415 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Content.Server.GameObjects.Components.Mobs; +using Content.Server.GameObjects.Components.Projectiles; +using Content.Server.GameObjects.Components.Sound; +using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition; +using Content.Server.GameObjects.EntitySystems; +using Content.Shared.Audio; +using Content.Shared.GameObjects.Components.Weapons.Ranged; +using Content.Shared.Physics; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Audio; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.EntitySystemMessages; +using Robust.Shared.GameObjects.Systems; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Map; +using Robust.Shared.Interfaces.Physics; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Log; +using Robust.Shared.Map; +using Robust.Shared.Maths; +using Robust.Shared.Physics; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels +{ + /// + /// All of the ranged weapon components inherit from this to share mechanics like shooting etc. + /// Only difference between them is how they retrieve a projectile to shoot (battery, magazine, etc.) + /// + public abstract class ServerRangedBarrelComponent : SharedRangedBarrelComponent, IUse, IInteractUsing + { + // There's still some of py01 and PJB's work left over, especially in underlying shooting logic, + // it's just when I re-organised it changed me as the contributor +#pragma warning disable 649 + [Dependency] private IGameTiming _gameTiming; + [Dependency] private IRobustRandom _robustRandom; +#pragma warning restore 649 + + public override FireRateSelector FireRateSelector => _fireRateSelector; + private FireRateSelector _fireRateSelector; + public override FireRateSelector AllRateSelectors => _fireRateSelector; + private FireRateSelector _allRateSelectors; + public override float FireRate => _fireRate; + private float _fireRate; + + // _lastFire is when we actually fired (so if we hold the button then recoil doesn't build up if we're not firing) + private TimeSpan _lastFire; + + public abstract IEntity PeekAmmo(); + public abstract IEntity TakeProjectile(); + + // Recoil / spray control + private Angle _minAngle; + private Angle _maxAngle; + private Angle _currentAngle = Angle.Zero; + /// + /// How slowly the angle's theta decays per second in radians + /// + private float _angleDecay; + /// + /// How quickly the angle's theta builds for every shot fired in radians + /// + private float _angleIncrease; + // Multiplies the ammo spread to get the final spread of each pellet + private float _spreadRatio; + + public bool CanMuzzleFlash => _canMuzzleFlash; + private bool _canMuzzleFlash = true; + + // Sounds + public string SoundGunshot + { + get => _soundGunshot; + set => _soundGunshot = value; + } + private string _soundGunshot; + public string SoundEmpty => _soundEmpty; + private string _soundEmpty; + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + serializer.DataField(ref _fireRateSelector, "currentSelector", FireRateSelector.Safety); + serializer.DataField(ref _fireRate, "fireRate", 2.0f); + + // This hard-to-read area's dealing with recoil + // Use degrees in yaml as it's easier to read compared to "0.0125f" + if (serializer.Reading) + { + var minAngle = serializer.ReadDataField("minAngle", 0) / 2; + _minAngle = Angle.FromDegrees(minAngle); + // Random doubles it as it's +/- so uhh we'll just half it here for readability + var maxAngle = serializer.ReadDataField("maxAngle", 45) / 2; + _maxAngle = Angle.FromDegrees(maxAngle); + var angleIncrease = serializer.ReadDataField("angleIncrease", (40 / _fireRate)); + _angleIncrease = angleIncrease * (float) Math.PI / 180; + var angleDecay = serializer.ReadDataField("angleDecay", (float) 20); + _angleDecay = angleDecay * (float) Math.PI / 180; + serializer.DataField(ref _spreadRatio, "ammoSpreadRatio", 1.0f); + + // FireRate options + var allFireRates = serializer.ReadDataField("allSelectors", new List()); + foreach (var fireRate in allFireRates) + { + _allRateSelectors |= fireRate; + } + } + + // For simplicity we'll enforce it this way; ammo determines max spread + if (_spreadRatio > 1.0f) + { + Logger.Error("SpreadRatio must be <= 1.0f for guns"); + throw new InvalidOperationException(); + } + + serializer.DataField(ref _canMuzzleFlash, "canMuzzleFlash", true); + // Sounds + serializer.DataField(ref _soundGunshot, "soundGunshot", null); + serializer.DataField(ref _soundEmpty, "soundEmpty", "/Audio/Guns/Empty/empty.ogg"); + } + + public override void OnAdd() + { + base.OnAdd(); + var rangedWeapon = Owner.GetComponent(); + rangedWeapon.Barrel = this; + rangedWeapon.FireHandler += Fire; + rangedWeapon.WeaponCanFireHandler += WeaponCanFire; + } + + public override void OnRemove() + { + base.OnRemove(); + var rangedWeapon = Owner.GetComponent(); + rangedWeapon.Barrel = null; + rangedWeapon.FireHandler -= Fire; + rangedWeapon.WeaponCanFireHandler -= WeaponCanFire; + } + + private Angle GetRecoilAngle(Angle direction) + { + var currentTime = _gameTiming.CurTime; + var timeSinceLastFire = (currentTime - _lastFire).TotalSeconds; + var newTheta = Math.Clamp(_currentAngle.Theta + _angleIncrease - _angleDecay * timeSinceLastFire, _minAngle.Theta, _maxAngle.Theta); + _currentAngle = new Angle(newTheta); + + var random = (_robustRandom.NextDouble() - 0.5) * 2; + var angle = Angle.FromDegrees(direction.Degrees + _currentAngle.Degrees * random); + return angle; + } + + public abstract bool UseEntity(UseEntityEventArgs eventArgs); + public abstract bool InteractUsing(InteractUsingEventArgs eventArgs); + + public void ChangeFireSelector(FireRateSelector rateSelector) + { + if ((rateSelector & AllRateSelectors) != 0) + { + _fireRateSelector = rateSelector; + return; + } + + throw new InvalidOperationException(); + } + + protected virtual bool WeaponCanFire() + { + // If the ServerRangedWeaponComponent gets re-done probably need to add the checks here + return true; + } + + private void Fire(IEntity shooter, GridCoordinates target) + { + var soundSystem = EntitySystem.Get(); + if (ShotsLeft == 0) + { + if (_soundEmpty != null) + { + soundSystem.PlayAtCoords(_soundEmpty, Owner.Transform.GridPosition); + } + return; + } + + var ammo = PeekAmmo(); + var projectile = TakeProjectile(); + if (projectile == null) + { + soundSystem.PlayAtCoords(_soundEmpty, Owner.Transform.GridPosition); + return; + } + + // At this point firing is confirmed + var worldPosition = IoCManager.Resolve().GetGrid(target.GridID).LocalToWorld(target).Position; + var direction = (worldPosition - shooter.Transform.WorldPosition).ToAngle(); + var angle = GetRecoilAngle(direction); + // This should really be client-side but for now we'll just leave it here + if (shooter.TryGetComponent(out CameraRecoilComponent recoilComponent)) + { + recoilComponent.Kick(-angle.ToVec() * 0.15f); + } + + // This section probably needs tweaking so there can be caseless hitscan etc. + if (projectile.TryGetComponent(out HitscanComponent hitscan)) + { + FireHitscan(shooter, hitscan, angle); + } + else if (projectile.HasComponent()) + { + var ammoComponent = ammo.GetComponent(); + + FireProjectiles(shooter, projectile, ammoComponent.ProjectilesFired, ammoComponent.EvenSpreadAngle, angle, ammoComponent.Velocity); + + if (CanMuzzleFlash) + { + ammoComponent.MuzzleFlash(Owner.Transform.GridPosition, angle); + } + + if (ammoComponent.Caseless) + { + ammo.Delete(); + } + } + else + { + // Invalid types + throw new InvalidOperationException(); + } + + soundSystem.PlayAtCoords(_soundGunshot, Owner.Transform.GridPosition); + _lastFire = _gameTiming.CurTime; + + return; + } + + /// + /// Drops a single cartridge / shell + /// Made as a static function just because multiple places need it + /// + /// + /// + /// + /// + /// + public static void EjectCasing( + IEntity entity, + bool playSound = true, + IRobustRandom robustRandom = null, + IPrototypeManager prototypeManager = null, + Direction[] ejectDirections = null) + { + if (robustRandom == null) + { + robustRandom = IoCManager.Resolve(); + } + + if (ejectDirections == null) + { + ejectDirections = new[] {Direction.East, Direction.North, Direction.South, Direction.West}; + } + + const float ejectOffset = 0.2f; + var ammo = entity.GetComponent(); + var offsetPos = (robustRandom.NextFloat() * ejectOffset, robustRandom.NextFloat() * ejectOffset); + entity.Transform.GridPosition = entity.Transform.GridPosition.Offset(offsetPos); + entity.Transform.LocalRotation = robustRandom.Pick(ejectDirections).ToAngle(); + + if (ammo.SoundCollectionEject == null || !playSound) + { + return; + } + + if (prototypeManager == null) + { + prototypeManager = IoCManager.Resolve(); + } + + var soundCollection = prototypeManager.Index(ammo.SoundCollectionEject); + var randomFile = robustRandom.Pick(soundCollection.PickFiles); + EntitySystem.Get().PlayAtCoords(randomFile, entity.Transform.GridPosition, AudioParams.Default.WithVolume(-1)); + } + + /// + /// Drops multiple cartridges / shells on the floor + /// Wraps EjectCasing to make it less toxic for bulk ejections + /// + /// + public static void EjectCasings(IEnumerable entities) + { + var robustRandom = IoCManager.Resolve(); + var prototypeManager = IoCManager.Resolve(); + var ejectDirections = new[] {Direction.East, Direction.North, Direction.South, Direction.West}; + var soundPlayCount = 0; + var playSound = true; + + foreach (var entity in entities) + { + EjectCasing(entity, playSound, robustRandom, prototypeManager, ejectDirections); + soundPlayCount++; + if (soundPlayCount > 3) + { + playSound = false; + } + } + } + + #region Firing + /// + /// Handles firing one or many projectiles + /// + private void FireProjectiles(IEntity shooter, IEntity baseProjectile, int count, float evenSpreadAngle, Angle angle, float velocity) + { + List sprayAngleChange = null; + if (count > 1) + { + evenSpreadAngle *= _spreadRatio; + sprayAngleChange = Linspace(-evenSpreadAngle / 2, evenSpreadAngle / 2, count); + } + + for (var i = 0; i < count; i++) + { + IEntity projectile; + + if (i == 0) + { + projectile = baseProjectile; + } + else + { + projectile = + Owner.EntityManager.SpawnEntity(baseProjectile.Prototype.ID, Owner.Transform.GridPosition); + } + + Angle projectileAngle; + + if (sprayAngleChange != null) + { + projectileAngle = angle + sprayAngleChange[i]; + } + else + { + projectileAngle = angle; + } + + var physicsComponent = projectile.GetComponent(); + physicsComponent.Status = BodyStatus.InAir; + projectile.Transform.GridPosition = Owner.Transform.GridPosition; + + var projectileComponent = projectile.GetComponent(); + projectileComponent.IgnoreEntity(shooter); + projectile.GetComponent().LinearVelocity = projectileAngle.ToVec() * velocity; + projectile.Transform.LocalRotation = projectileAngle.Theta; + } + } + + /// + /// Returns a list of numbers that form a set of equal intervals between the start and end value. Used to calculate shotgun spread angles. + /// + private List Linspace(double start, double end, int intervals) + { + DebugTools.Assert(intervals > 1); + + var linspace = new List(intervals); + + for (var i = 0; i <= intervals - 1; i++) + { + linspace.Add(Angle.FromDegrees(start + (end - start) * i / (intervals - 1))); + } + return linspace; + } + + /// + /// Fires hitscan entities and then displays their effects + /// + private void FireHitscan(IEntity shooter, HitscanComponent hitscan, Angle angle) + { + var ray = new CollisionRay(Owner.Transform.GridPosition.Position, angle.ToVec(), (int) hitscan.CollisionMask); + var physicsManager = IoCManager.Resolve(); + var rayCastResults = physicsManager.IntersectRay(Owner.Transform.MapID, ray, hitscan.MaxLength, shooter, false).ToList(); + + if (rayCastResults.Count >= 1) + { + var result = rayCastResults[0]; + var distance = result.HitEntity != null ? result.Distance : hitscan.MaxLength; + hitscan.FireEffects(shooter, distance, angle, result.HitEntity); + + if (result.HitEntity == null || !result.HitEntity.TryGetComponent(out DamageableComponent damageable)) + { + return; + } + + damageable.TakeDamage( + hitscan.DamageType, + (int)Math.Round(hitscan.Damage, MidpointRounding.AwayFromZero), + Owner, + shooter); + //I used Math.Round over Convert.toInt32, as toInt32 always rounds to + //even numbers if halfway between two numbers, rather than rounding to nearest + } + else + { + hitscan.FireEffects(shooter, hitscan.MaxLength, angle); + } + } + #endregion + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponCapacitorComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponCapacitorComponent.cs deleted file mode 100644 index 5df47f000b..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponCapacitorComponent.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using Content.Server.GameObjects.Components.Power; -using Content.Shared.GameObjects.Components.Power; -using Robust.Server.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan -{ - [RegisterComponent] - public class HitscanWeaponCapacitorComponent : PowerCellComponent - { - private AppearanceComponent _appearance; - - public override string Name => "HitscanWeaponCapacitor"; - - public override float Charge - { - get => base.Charge; - set - { - base.Charge = value; - _updateAppearance(); - } - } - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - } - - public override void Initialize() - { - base.Initialize(); - - Charge = Capacity; - Owner.TryGetComponent(out _appearance); - - } - - public float GetChargeFrom(float toDeduct) - { - //Use this function when you want to shoot even though you don't have enough energy for basecost - ChargeChanged(); - var chargeChangedBy = Math.Min(this.Charge, toDeduct); - this.DeductCharge(chargeChangedBy); - _updateAppearance(); - return chargeChangedBy; - } - - public void FillFrom(PowerStorageComponent battery) - { - var capacitorPowerDeficit = this.Capacity - this.Charge; - if (battery.CanDeductCharge(capacitorPowerDeficit)) - { - battery.DeductCharge(capacitorPowerDeficit); - this.AddCharge(capacitorPowerDeficit); - } - else - { - this.AddCharge(battery.Charge); - battery.DeductCharge(battery.Charge); - } - _updateAppearance(); - } - - private void _updateAppearance() - { - _appearance?.SetData(PowerCellVisuals.ChargeLevel, Charge / Capacity); - } - } - - -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs deleted file mode 100644 index f8f5444e2d..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs +++ /dev/null @@ -1,143 +0,0 @@ -using System; -using System.Linq; -using Content.Server.GameObjects.Components.Power; -using Content.Server.GameObjects.Components.Sound; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Utility; -using Content.Shared.GameObjects; -using Content.Shared.Interfaces; -using Content.Shared.Physics; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.Audio; -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.EntitySystemMessages; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Physics; -using Robust.Shared.Interfaces.Timing; -using Robust.Shared.IoC; -using Robust.Shared.Map; -using Robust.Shared.Maths; -using Robust.Shared.Physics; -using Robust.Shared.Serialization; -using Robust.Shared.Utility; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan -{ - [RegisterComponent] - public class HitscanWeaponComponent : Component, IInteractUsing - { - private const float MaxLength = 20; - public override string Name => "HitscanWeapon"; - - string _spritename; - private int _damage; - private int _baseFireCost; - private float _lowerChargeLimit; - private string _fireSound; - - //As this is a component that sits on the weapon rather than a static value - //we just declare the field and then use GetComponent later to actually get it. - //Do remember to add it in both the .yaml prototype and the factory in EntryPoint.cs - //Otherwise you will get errors - private HitscanWeaponCapacitorComponent capacitorComponent; - - public int Damage => _damage; - - public int BaseFireCost => _baseFireCost; - - public HitscanWeaponCapacitorComponent CapacitorComponent => capacitorComponent; - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - - serializer.DataField(ref _spritename, "fireSprite", "Objects/laser.png"); - serializer.DataField(ref _damage, "damage", 10); - serializer.DataField(ref _baseFireCost, "baseFireCost", 300); - serializer.DataField(ref _lowerChargeLimit, "lowerChargeLimit", 10); - serializer.DataField(ref _fireSound, "fireSound", "/Audio/laser.ogg"); - } - - public override void Initialize() - { - base.Initialize(); - var rangedWeapon = Owner.GetComponent(); - capacitorComponent = Owner.GetComponent(); - rangedWeapon.FireHandler = Fire; - - } - - public bool InteractUsing(InteractUsingEventArgs eventArgs) - { - if (!eventArgs.Using.TryGetComponent(out PowerStorageComponent component)) - { - return false; - } - if (capacitorComponent.Full) - { - Owner.PopupMessage(eventArgs.User, "Capacitor at max charge"); - return false; - } - capacitorComponent.FillFrom(component); - return true; - } - - private void Fire(IEntity user, GridCoordinates clickLocation) - { - if (capacitorComponent.Charge < _lowerChargeLimit) - {//If capacitor has less energy than the lower limit, do nothing - return; - } - float energyModifier = capacitorComponent.GetChargeFrom(_baseFireCost) / _baseFireCost; - var userPosition = user.Transform.WorldPosition; //Remember world positions are ephemeral and can only be used instantaneously - var angle = new Angle(clickLocation.Position - userPosition); - - var ray = new CollisionRay(userPosition, angle.ToVec(), (int)(CollisionGroup.Opaque)); - var rayCastResults = IoCManager.Resolve().IntersectRay(user.Transform.MapID, ray, MaxLength, user, returnOnFirstHit: false).ToList(); - - //The first result is guaranteed to be the closest one - if (rayCastResults.Count >= 1) - { - Hit(rayCastResults[0], energyModifier, user); - AfterEffects(user, rayCastResults[0].Distance, angle, energyModifier); - } - else - { - AfterEffects(user, MaxLength, angle, energyModifier); - } - } - - protected virtual void Hit(RayCastResults ray, float damageModifier, IEntity user = null) - { - if (ray.HitEntity != null && ray.HitEntity.TryGetComponent(out DamageableComponent damage)) - { - damage.TakeDamage(DamageType.Heat, (int)Math.Round(_damage * damageModifier, MidpointRounding.AwayFromZero), Owner, user); - //I used Math.Round over Convert.toInt32, as toInt32 always rounds to - //even numbers if halfway between two numbers, rather than rounding to nearest - } - } - - protected virtual void AfterEffects(IEntity user, float distance, Angle angle, float energyModifier) - { - var time = IoCManager.Resolve().CurTime; - var offset = angle.ToVec() * distance / 2; - var message = new EffectSystemMessage - { - EffectSprite = _spritename, - Born = time, - DeathTime = time + TimeSpan.FromSeconds(1), - Size = new Vector2(distance, 1f), - Coordinates = user.Transform.GridPosition.Translated(offset), - //Rotated from east facing - Rotation = (float) angle.Theta, - ColorDelta = new Vector4(0, 0, 0, -1500f), - Color = Vector4.Multiply(new Vector4(255, 255, 255, 750), energyModifier), - - Shaded = false - }; - EntitySystem.Get().CreateParticle(message); - EntitySystem.Get().PlayFromEntity(_fireSound, Owner, AudioParams.Default.WithVolume(-5)); - } - } -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs deleted file mode 100644 index 42bb2e2918..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs +++ /dev/null @@ -1,240 +0,0 @@ -using System; -using System.Collections.Generic; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Utility; -using Content.Shared.GameObjects.Components.Weapons.Ranged; -using Content.Shared.Interfaces; -using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile -{ - [RegisterComponent] - public class AmmoBoxComponent : Component, IInteractUsing, IMapInit - // TODO: Potential improvements: - // Add verbs for stack splitting - // Behaviour is largely the same as BallisticMagazine except you can't insert it into a gun. - { - public override string Name => "AmmoBox"; - private BallisticCaliber _caliber; - private int _capacity; - [ViewVariables] private int _availableSpawnCount; - - [ViewVariables] private readonly Stack _loadedBullets = new Stack(); - - [ViewVariables] - public string FillType => _fillType; - private string _fillType; - - [ViewVariables] private Container _bulletContainer; - [ViewVariables] private AppearanceComponent _appearance; - - [ViewVariables] public int Capacity => _capacity; - [ViewVariables] public BallisticCaliber Caliber => _caliber; - [ViewVariables] public int CountLeft => _loadedBullets.Count + _availableSpawnCount; - - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - - serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); - serializer.DataField(ref _fillType, "fill", null); - serializer.DataField(ref _capacity, "capacity", 30); - serializer.DataField(ref _availableSpawnCount, "availableSpawnCount", Capacity); - } - - private void _updateAppearance() - { - _appearance.SetData(BallisticMagazineVisuals.AmmoLeft, CountLeft); - } - - public void MapInit() - { - _availableSpawnCount = Capacity; - } - - public override void Initialize() - { - base.Initialize(); - - _appearance = Owner.GetComponent(); - } - - /// - protected override void Startup() - { - base.Startup(); - - _bulletContainer = - ContainerManagerComponent.Ensure("box_bullet_container", Owner, out var existed); - - if (existed) - { - foreach (var entity in _bulletContainer.ContainedEntities) - { - _loadedBullets.Push(entity); - } - } - - _updateAppearance(); - _appearance.SetData(BallisticMagazineVisuals.AmmoCapacity, Capacity); - } - - AmmoBoxTransferPopupMessage CanTransferFrom(IEntity source) - { - // Currently the below duplicates mags but at some stage these will likely differ - if (source.TryGetComponent(out BallisticMagazineComponent magazineComponent)) - { - if (magazineComponent.Caliber != Caliber) - { - return new AmmoBoxTransferPopupMessage(result: false, message: "Wrong caliber"); - } - - if (CountLeft == Capacity) - { - return new AmmoBoxTransferPopupMessage(result: false, message: "Already full"); - } - - if (magazineComponent.CountLoaded == 0) - { - return new AmmoBoxTransferPopupMessage(result: false, message: "No ammo to transfer"); - } - - return new AmmoBoxTransferPopupMessage(result: true, message: ""); - } - - if (source.TryGetComponent(out AmmoBoxComponent boxComponent)) - { - if (boxComponent.Caliber != Caliber) - { - return new AmmoBoxTransferPopupMessage(result: false, message: "Wrong caliber"); - } - - if (CountLeft == Capacity) - { - return new AmmoBoxTransferPopupMessage(result: false, message: "Already full"); - } - - if (boxComponent.CountLeft == 0) - { - return new AmmoBoxTransferPopupMessage(result: false, message: "No ammo to transfer"); - } - - return new AmmoBoxTransferPopupMessage(result: true, message: ""); - } - - return new AmmoBoxTransferPopupMessage(result: false, message: ""); - } - - // TODO: Potentially abstract out to reduce duplicate structs - private struct AmmoBoxTransferPopupMessage - { - public readonly bool Result; - public readonly string Message; - - public AmmoBoxTransferPopupMessage(bool result, string message) - { - Result = result; - Message = message; - } - } - - bool IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) - { - var ammoBoxTransfer = CanTransferFrom(eventArgs.Using); - if (ammoBoxTransfer.Result) { - IEntity bullet; - if (eventArgs.Using.TryGetComponent(out BallisticMagazineComponent magazineComponent)) - { - int fillCount = Math.Min(magazineComponent.CountLoaded, Capacity - CountLeft); - for (int i = 0; i < fillCount; i++) - { - bullet = magazineComponent.TakeBullet(); - AddBullet(bullet); - } - eventArgs.User.PopupMessage(eventArgs.User, $"Transferred {fillCount} rounds"); - return true; - } - if (eventArgs.Using.TryGetComponent(out AmmoBoxComponent boxComponent)) - { - int fillCount = Math.Min(boxComponent.CountLeft, Capacity - CountLeft); - for (int i = 0; i < fillCount; i++) - { - bullet = boxComponent.TakeBullet(); - AddBullet(bullet); - } - eventArgs.User.PopupMessage(eventArgs.User, $"Transferred {fillCount} rounds"); - return true; - } - } - else - { - eventArgs.User.PopupMessage(eventArgs.User, ammoBoxTransfer.Message); - } - - return false; - } - - public void AddBullet(IEntity bullet) - { - if (Owner.TryGetComponent(out BallisticMagazineComponent magazineComponent)) - { - magazineComponent.AddBullet(bullet); - return; - } - if (!bullet.TryGetComponent(out BallisticBulletComponent component)) - { - throw new ArgumentException("entity isn't a bullet.", nameof(bullet)); - } - - if (component.Caliber != Caliber) - { - throw new ArgumentException("entity is of the wrong caliber.", nameof(bullet)); - } - - if (CountLeft >= Capacity) - { - throw new InvalidOperationException("Box is full."); - } - - _bulletContainer.Insert(bullet); - _loadedBullets.Push(bullet); - _updateAppearance(); - } - - public IEntity TakeBullet() - { - IEntity bullet; - if (Owner.TryGetComponent(out BallisticMagazineComponent magazineComponent)) - { - bullet = magazineComponent.TakeBullet(); - return bullet; - } - if (_loadedBullets.Count == 0) - { - if (_availableSpawnCount == 0) - { - return null; - } - - _availableSpawnCount -= 1; - bullet = Owner.EntityManager.SpawnEntity(FillType, Owner.Transform.GridPosition); - } - else - { - bullet = _loadedBullets.Pop(); - _bulletContainer.Remove(bullet); - } - - _updateAppearance(); - return bullet; - } - - } -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs deleted file mode 100644 index 5060a28b9d..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticBulletComponent.cs +++ /dev/null @@ -1,106 +0,0 @@ -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile -{ - /// - /// Passes information about the projectiles to be fired by AmmoWeapons - /// - [RegisterComponent] - public class BallisticBulletComponent : Component - { - public override string Name => "BallisticBullet"; - - private BallisticCaliber _caliber; - /// - /// Cartridge calibre, restricts what AmmoWeapons this ammo can be fired from. - /// - [ViewVariables(VVAccess.ReadWrite)] - public BallisticCaliber Caliber { get => _caliber; set => _caliber = value; } - - private string _projectileID; - /// - /// YAML ID of the projectiles to be created when firing this ammo. - /// - [ViewVariables(VVAccess.ReadWrite)] - public string ProjectileID { get => _projectileID; set => _projectileID = value; } - - private int _projectilesFired; - /// - /// How many copies of the projectile are shot. - /// - [ViewVariables(VVAccess.ReadWrite)] - public int ProjectilesFired { get => _projectilesFired; set => _projectilesFired = value; } - - private float _spreadStdDev_Ammo; - /// - /// Weapons that fire projectiles from ammo types. - /// - [ViewVariables(VVAccess.ReadWrite)] - public float SpreadStdDev_Ammo { get => _spreadStdDev_Ammo; set => _spreadStdDev_Ammo = value; } - - private float _evenSpreadAngle_Ammo; - /// - /// Arc angle of shotgun pellet spreads, only used if multiple projectiles are being fired. - /// - [ViewVariables(VVAccess.ReadWrite)] - public float EvenSpreadAngle_Ammo { get => _evenSpreadAngle_Ammo; set => _evenSpreadAngle_Ammo = value; } - - private float _velocity_Ammo; - /// - /// Adds additional velocity to the projectile, on top of what it already has. - /// - [ViewVariables(VVAccess.ReadWrite)] - public float Velocity_Ammo { get => _velocity_Ammo; set => _velocity_Ammo = value; } - - private bool _spent; - /// - /// If the ammo cartridge has been shot already. - /// - [ViewVariables(VVAccess.ReadWrite)] - public bool Spent { get => _spent; set => _spent = value; } - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); - serializer.DataField(ref _projectileID, "projectile", null); - serializer.DataField(ref _spent, "spent", false); - serializer.DataField(ref _projectilesFired, "projectilesfired", 1); - serializer.DataField(ref _spreadStdDev_Ammo, "ammostddev", 0); - serializer.DataField(ref _evenSpreadAngle_Ammo, "ammospread", 0); - serializer.DataField(ref _velocity_Ammo, "ammovelocity", 0); - } - } - public enum BallisticCaliber - { - Unspecified = 0, - // .32 - A32, - // .357 - A357, - // .44 - A44, - // .45mm - A45mm, - // .50 cal - A50, - // 5.56mm - A556mm, - // 6.5mm - A65mm, - // 7.62mm - A762mm, - // 9mm - A9mm, - // 10mm - A10mm, - // 20mm - A20mm, - // 24mm - A24mm, - // 12g - A12g, - } -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs deleted file mode 100644 index 67f93938ba..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs +++ /dev/null @@ -1,286 +0,0 @@ -using System; -using System.Collections.Generic; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Utility; -using Content.Shared.GameObjects.Components.Weapons.Ranged; -using Content.Shared.Interfaces; -using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile -{ - [RegisterComponent] - public class BallisticMagazineComponent : Component, IMapInit, IInteractUsing - { - public override string Name => "BallisticMagazine"; - - // Stack of loaded bullets. - [ViewVariables] private readonly Stack _loadedBullets = new Stack(); - private string _fillType; - - [ViewVariables] private Container _bulletContainer; - [ViewVariables] private AppearanceComponent _appearance; - - private BallisticMagazineType _magazineType; - private BallisticCaliber _caliber; - private int _capacity; - - [ViewVariables] public string FillType => _fillType; - [ViewVariables] public BallisticMagazineType MagazineType => _magazineType; - [ViewVariables] public BallisticCaliber Caliber => _caliber; - [ViewVariables] public int Capacity => _capacity; - - [ViewVariables] public int CountLoaded => _loadedBullets.Count + _availableSpawnCount; - - [ViewVariables] private int _availableSpawnCount; - - public event Action OnAmmoCountChanged; - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - - serializer.DataField(ref _magazineType, "magazine", BallisticMagazineType.Unspecified); - serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); - serializer.DataField(ref _fillType, "fill", null); - serializer.DataField(ref _capacity, "capacity", 20); - serializer.DataField(ref _availableSpawnCount, "availableSpawnCount", Capacity); - } - - public override void Initialize() - { - base.Initialize(); - - _appearance = Owner.GetComponent(); - } - - /// - protected override void Startup() - { - base.Startup(); - - _bulletContainer = - ContainerManagerComponent.Ensure("magazine_bullet_container", Owner, out var existed); - - if (existed) - { - foreach (var entity in _bulletContainer.ContainedEntities) - { - _loadedBullets.Push(entity); - } - } - - UpdateAppearance(); - - OnAmmoCountChanged?.Invoke(); - _appearance.SetData(BallisticMagazineVisuals.AmmoCapacity, Capacity); - } - - public void AddBullet(IEntity bullet) - { - if (!bullet.TryGetComponent(out BallisticBulletComponent component)) - { - throw new ArgumentException("entity isn't a bullet.", nameof(bullet)); - } - - if (component.Caliber != Caliber) - { - throw new ArgumentException("entity is of the wrong caliber.", nameof(bullet)); - } - - if (CountLoaded >= Capacity) - { - throw new InvalidOperationException("Magazine is full."); - } - - _bulletContainer.Insert(bullet); - _loadedBullets.Push(bullet); - UpdateAppearance(); - OnAmmoCountChanged?.Invoke(); - } - - public IEntity TakeBullet() - { - IEntity bullet; - if (_loadedBullets.Count == 0) - { - if (_availableSpawnCount == 0) - { - return null; - } - - _availableSpawnCount -= 1; - bullet = Owner.EntityManager.SpawnEntity(FillType, Owner.Transform.GridPosition); - } - else - { - bullet = _loadedBullets.Pop(); - _bulletContainer.Remove(bullet); - } - - UpdateAppearance(); - OnAmmoCountChanged?.Invoke(); - return bullet; - } - - // TODO: Allow putting individual casings into mag (also box) - AmmoMagTransferPopupMessage CanTransferFrom(IEntity source) - { - // Currently the below duplicates box but at some stage these will likely differ - if (source.TryGetComponent(out BallisticMagazineComponent magazineComponent)) - { - if (magazineComponent.Caliber != Caliber) - { - return new AmmoMagTransferPopupMessage(result: false, message: "Wrong caliber"); - } - - if (CountLoaded == Capacity) - { - return new AmmoMagTransferPopupMessage(result: false, message: "Already full"); - } - - if (magazineComponent.CountLoaded == 0) - { - return new AmmoMagTransferPopupMessage(result: false, message: "No ammo to transfer"); - } - - return new AmmoMagTransferPopupMessage(result: true, message: ""); - } - - // If box - if (source.TryGetComponent(out AmmoBoxComponent boxComponent)) - { - if (boxComponent.Caliber != Caliber) - { - return new AmmoMagTransferPopupMessage(result: false, message: "Wrong caliber"); - } - - if (CountLoaded == Capacity) - { - return new AmmoMagTransferPopupMessage(result: false, message: "Already full"); - } - - if (boxComponent.CountLeft == 0) - { - return new AmmoMagTransferPopupMessage(result: false, message: "No ammo to transfer"); - } - - return new AmmoMagTransferPopupMessage(result: true, message: ""); - } - - return new AmmoMagTransferPopupMessage(result: false, message: ""); - } - - // TODO: Potentially abstract out to reduce duplicate structs - private struct AmmoMagTransferPopupMessage - { - public readonly bool Result; - public readonly string Message; - - public AmmoMagTransferPopupMessage(bool result, string message) - { - Result = result; - Message = message; - } - } - - bool IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) - { - var ammoMagTransfer = CanTransferFrom(eventArgs.Using); - if (ammoMagTransfer.Result) { - IEntity bullet; - if (eventArgs.Using.TryGetComponent(out BallisticMagazineComponent magazineComponent)) - { - int fillCount = Math.Min(magazineComponent.CountLoaded, Capacity - CountLoaded); - for (int i = 0; i < fillCount; i++) - { - bullet = magazineComponent.TakeBullet(); - AddBullet(bullet); - } - eventArgs.User.PopupMessage(eventArgs.User, $"Transferred {fillCount} rounds"); - return true; - } - if (eventArgs.Using.TryGetComponent(out AmmoBoxComponent boxComponent)) - { - int fillCount = Math.Min(boxComponent.CountLeft, Capacity - CountLoaded); - for (int i = 0; i < fillCount; i++) - { - bullet = boxComponent.TakeBullet(); - AddBullet(bullet); - } - eventArgs.User.PopupMessage(eventArgs.User, $"Transferred {fillCount} rounds"); - return true; - } - } - else - { - eventArgs.User.PopupMessage(eventArgs.User, ammoMagTransfer.Message); - } - - return false; - } - - private void UpdateAppearance() - { - _appearance.SetData(BallisticMagazineVisuals.AmmoLeft, CountLoaded); - } - - public void MapInit() - { - _availableSpawnCount = Capacity; - } - } - - public enum BallisticMagazineType - { - Unspecified = 0, - - // .32 - A32, - - // .357 - A357, - - // .44 - A44, - - // .45mm - A45mm, - - // .50 cal - A50, - - // 5.56mm - A556mm, - - // 6.5mm - A65mm, - - // 7.62mm - A762mm, - Maxim, - - // 9mm - A9mm, - A9mmSMG, - A9mmTopMounted, - - // 10mm - A10mm, - A10mmSMG, - - // 20mm - A20mm, - - // 24mm - A24mm, - - // 12g - A12g, - } -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs deleted file mode 100644 index 3cb73b7272..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs +++ /dev/null @@ -1,311 +0,0 @@ -using System; -using System.Collections.Generic; -using Content.Server.GameObjects.Components.Sound; -using Content.Server.GameObjects.EntitySystems; -using Content.Server.Utility; -using Content.Shared.GameObjects; -using Content.Shared.GameObjects.Components.Weapons.Ranged; -using Content.Shared.Interfaces; -using JetBrains.Annotations; -using Robust.Server.GameObjects; -using Robust.Server.GameObjects.Components.Container; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Server.Interfaces.GameObjects; -using Robust.Shared.Audio; -using Robust.Shared.GameObjects; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; -using Robust.Shared.Maths; -using Robust.Shared.Random; -using Robust.Shared.Serialization; -using Robust.Shared.Utility; -using Robust.Shared.ViewVariables; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile -{ - /// - /// Guns that have a magazine. - /// - [RegisterComponent] - public class BallisticMagazineWeaponComponent : BallisticWeaponComponent, IUse, IInteractUsing, IMapInit - { - private const float BulletOffset = 0.2f; - - public override string Name => "BallisticMagazineWeapon"; - public override uint? NetID => ContentNetIDs.BALLISTIC_MAGAZINE_WEAPON; - - [ViewVariables] private string _defaultMagazine; - - public ContainerSlot MagazineSlot => _magazineSlot; - [ViewVariables] private ContainerSlot _magazineSlot; - private List _magazineTypes; - - [ViewVariables] public List MagazineTypes => _magazineTypes; - [ViewVariables] private IEntity Magazine => _magazineSlot.ContainedEntity; - -#pragma warning disable 649 - [Dependency] private readonly IRobustRandom _bulletDropRandom; -#pragma warning restore 649 - [ViewVariables] private string _magInSound; - [ViewVariables] private string _magOutSound; - [ViewVariables] private string _autoEjectSound; - [ViewVariables] private bool _autoEjectMagazine; - [ViewVariables] private AppearanceComponent _appearance; - - private static readonly Direction[] RandomBulletDirs = - { - Direction.North, - Direction.East, - Direction.South, - Direction.West - }; - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - serializer.DataField(ref _magazineTypes, "magazines", - new List {BallisticMagazineType.Unspecified}); - serializer.DataField(ref _defaultMagazine, "default_magazine", null); - serializer.DataField(ref _autoEjectMagazine, "auto_eject_magazine", false); - serializer.DataField(ref _autoEjectSound, "sound_auto_eject", null); - serializer.DataField(ref _magInSound, "sound_magazine_in", null); - serializer.DataField(ref _magOutSound, "sound_magazine_out", null); - } - - public override void Initialize() - { - base.Initialize(); - _appearance = Owner.GetComponent(); - } - - /// - protected override void Startup() - { - base.Startup(); - _magazineSlot = ContainerManagerComponent.Ensure("ballistic_gun_magazine", Owner); - if (Magazine != null) - { - // Already got magazine from loading a container. - Magazine.GetComponent().OnAmmoCountChanged += MagazineAmmoCountChanged; - } - UpdateAppearance(); - } - - public bool InsertMagazine(IEntity magazine, bool playSound = true) - { - if (!magazine.TryGetComponent(out BallisticMagazineComponent magazinetype)) - { - throw new ArgumentException("Not a magazine", nameof(magazine)); - } - if (!MagazineTypes.Contains(magazinetype.MagazineType)) - { - throw new ArgumentException("Wrong magazine type", nameof(magazine)); - } - if (!_magazineSlot.Insert(magazine)) - { - return false; - } - if (_magInSound != null && playSound) - { - EntitySystem.Get().PlayFromEntity(_magInSound, Owner); - } - magazinetype.OnAmmoCountChanged += MagazineAmmoCountChanged; - if (GetChambered(0) == null) - { - // No bullet in chamber, load one from magazine. - var bullet = magazinetype.TakeBullet(); - if (bullet != null) - { - LoadIntoChamber(0, bullet); - } - } - UpdateAppearance(); - Dirty(); - return true; - } - - public bool EjectMagazine(bool playSound = true) - { - var entity = Magazine; - if (entity == null) - { - return false; - } - if (_magazineSlot.Remove(entity)) - { - entity.Transform.GridPosition = Owner.Transform.GridPosition; - if (_magOutSound != null && playSound) - { - EntitySystem.Get().PlayFromEntity(_magOutSound, Owner, AudioParams.Default.WithVolume(20)); - } - UpdateAppearance(); - Dirty(); - entity.GetComponent().OnAmmoCountChanged -= MagazineAmmoCountChanged; - return true; - } - UpdateAppearance(); - Dirty(); - return false; - } - - // these are complete strings for the sake of the shared string dict - [UsedImplicitly] - private static readonly string[] _bulletDropSounds = - { - "/Audio/Guns/Casings/casingfall1.ogg", - "/Audio/Guns/Casings/casingfall2.ogg", - "/Audio/Guns/Casings/casingfall3.ogg" - }; - - protected override void CycleChamberedBullet(int chamber) - { - DebugTools.Assert(chamber == 0); - - // Eject chambered bullet. - var entity = RemoveFromChamber(chamber); - if (entity == null) - { - return; - } - var offsetPos = (CalcBulletOffset(), CalcBulletOffset()); - entity.Transform.GridPosition = Owner.Transform.GridPosition.Offset(offsetPos); - entity.Transform.LocalRotation = _bulletDropRandom.Pick(RandomBulletDirs).ToAngle(); - var bulletDropNext = _bulletDropRandom.Next(1, 3); - var effect = _bulletDropSounds[bulletDropNext]; - EntitySystem.Get().PlayFromEntity(effect, Owner, AudioParams.Default.WithVolume(-3)); - - if (Magazine != null) - { - var magComponent = Magazine.GetComponent(); - var bullet = magComponent.TakeBullet(); - if (bullet != null) - { - LoadIntoChamber(0, bullet); - } - - if (magComponent.CountLoaded == 0 && _autoEjectMagazine) - { - DoAutoEject(); - } - } - Dirty(); - UpdateAppearance(); - } - - private float CalcBulletOffset() - { - return _bulletDropRandom.NextFloat() * (BulletOffset * 2) - BulletOffset; - } - - private void DoAutoEject() - { - SendNetworkMessage(new BmwComponentAutoEjectedMessage()); - EjectMagazine(); - if (_autoEjectSound != null) - { - EntitySystem.Get().PlayFromEntity(_autoEjectSound, Owner, AudioParams.Default.WithVolume(-5)); - } - Dirty(); - } - - public bool UseEntity(UseEntityEventArgs eventArgs) - { - var ret = EjectMagazine(); - if (ret) - { - Owner.PopupMessage(eventArgs.User, "Magazine ejected"); - } - else - { - Owner.PopupMessage(eventArgs.User, "No magazine"); - } - return true; - } - - public bool InteractUsing(InteractUsingEventArgs eventArgs) - { - if (!eventArgs.Using.TryGetComponent(out BallisticMagazineComponent component)) - { - return false; - } - if (Magazine != null) - { - Owner.PopupMessage(eventArgs.User, "Already got a magazine."); - return false; - } - if (!MagazineTypes.Contains(component.MagazineType)) - { - Owner.PopupMessage(eventArgs.User, "Magazine doesn't fit."); - return false; - } - return InsertMagazine(eventArgs.Using); - } - - private void MagazineAmmoCountChanged() - { - Dirty(); - UpdateAppearance(); - } - - private void UpdateAppearance() - { - if (Magazine != null) - { - var comp = Magazine.GetComponent(); - _appearance.SetData(BallisticMagazineWeaponVisuals.AmmoLeft, comp.CountLoaded); - _appearance.SetData(BallisticMagazineWeaponVisuals.AmmoCapacity, comp.Capacity); - _appearance.SetData(BallisticMagazineWeaponVisuals.MagazineLoaded, true); - } - else - { - _appearance.SetData(BallisticMagazineWeaponVisuals.AmmoLeft, 0); - _appearance.SetData(BallisticMagazineWeaponVisuals.AmmoLeft, 0); - _appearance.SetData(BallisticMagazineWeaponVisuals.MagazineLoaded, false); - } - } - - public override ComponentState GetComponentState() - { - var chambered = GetChambered(0) != null; - (int, int)? count = null; - if (Magazine != null) - { - var magComponent = Magazine.GetComponent(); - count = (magComponent.CountLoaded, magComponent.Capacity); - } - return new BallisticMagazineWeaponComponentState(chambered, count); - } - - [Verb] - public sealed class EjectMagazineVerb : Verb - { - protected override void GetData(IEntity user, BallisticMagazineWeaponComponent component, VerbData data) - { - if (component.Magazine == null) - { - data.Text = "Eject magazine (magazine missing)"; - data.Visibility = VerbVisibility.Disabled; - return; - } - - data.Text = "Eject magazine"; - } - - protected override void Activate(IEntity user, BallisticMagazineWeaponComponent component) - { - component.EjectMagazine(); - } - } - - void IMapInit.MapInit() - { - if (_defaultMagazine != null) - { - var magazine = Owner.EntityManager.SpawnEntity(_defaultMagazine, Owner.Transform.GridPosition); - InsertMagazine(magazine, false); - } - } - } -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs deleted file mode 100644 index df94536d9e..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticWeapon.cs +++ /dev/null @@ -1,169 +0,0 @@ -using Content.Server.GameObjects.Components.Sound; -using Robust.Server.GameObjects.Components.Container; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Map; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -using System; -using JetBrains.Annotations; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.IoC; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile -{ - /// - /// Handles firing projectiles from a contained . - /// - public abstract class BallisticWeaponComponent : BaseProjectileWeaponComponent - { - private Chamber[] _chambers; - - /// - /// Number of chambers created during initialization. - /// - private int _chamberCount; - - [ViewVariables] - private BallisticCaliber _caliber ; - /// - /// What type of ammo this gun can fire. - /// - - private string _soundGunEmpty; - /// - /// Sound played when trying to shoot if there is no ammo available. - /// - [ViewVariables(VVAccess.ReadWrite)] - public string SoundGunEmpty { get => _soundGunEmpty; set => _soundGunEmpty = value; } - - private float _spreadStdDevGun; - /// - /// Increases the standard deviation of the ammo being fired. - /// - [ViewVariables(VVAccess.ReadWrite)] - public float SpreadStdDevGun { get => _spreadStdDevGun; set => _spreadStdDevGun = value; } - - private float _evenSpreadAngleGun; - /// - /// Increases the evenspread of the ammo being fired. - /// - [ViewVariables(VVAccess.ReadWrite)] - public float EvenSpreadAngleGun { get => _evenSpreadAngleGun; set => _evenSpreadAngleGun = value; } - - private float _velocityGun; - /// - /// Increases the velocity of the ammo being fired. - /// - [ViewVariables(VVAccess.ReadWrite)] - public float VelocityGun { get => _velocityGun; set => _velocityGun = value; } - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - serializer.DataField(ref _soundGunEmpty, "sound_empty", "/Audio/Guns/Empty/empty.ogg"); - serializer.DataField(ref _spreadStdDevGun, "spreadstddev", 0); - serializer.DataField(ref _evenSpreadAngleGun, "evenspread", 0); - serializer.DataField(ref _velocityGun, "gunvelocity", 0); - serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); - serializer.DataField(ref _chamberCount, "chambers", 1); - } - - // for shared string dict, since we don't define these anywhere in content - [UsedImplicitly] - private static readonly string[] _ballisticsChambersStrings = - { - "ballistics_chamber_0", - "ballistics_chamber_1", - "ballistics_chamber_2", - "ballistics_chamber_3", - "ballistics_chamber_4", - "ballistics_chamber_5", - "ballistics_chamber_6", - "ballistics_chamber_7", - "ballistics_chamber_8", - "ballistics_chamber_9", - }; - - public override void Initialize() - { - base.Initialize(); - Owner.GetComponent().FireHandler = TryShoot; - _chambers = new Chamber[_chamberCount]; - for (var i = 0; i < _chambers.Length; i++) - { - var container = ContainerManagerComponent.Ensure($"ballistics_chamber_{i}", Owner); - _chambers[i] = new Chamber(container); - } - } - - /// - /// Fires projectiles based on loaded ammo from entity to a coordinate. - /// - protected void TryShoot(IEntity user, GridCoordinates clickLocation) - { - var ammo = GetChambered(FirstChamber)?.GetComponent(); - CycleChamberedBullet(FirstChamber); - if (ammo == null || ammo?.Spent == true || ammo?.Caliber != _caliber) - { - PlayEmptySound(); - return; - } - ammo.Spent = true; - var total_stdev = _spreadStdDevGun + ammo.SpreadStdDev_Ammo; - var final_evenspread = _evenSpreadAngleGun + ammo.EvenSpreadAngle_Ammo; - var final_velocity = _velocityGun + ammo.Velocity_Ammo; - FireAtCoord(user, clickLocation, ammo.ProjectileID, total_stdev, ammo.ProjectilesFired, final_evenspread, final_velocity); - } - - public IEntity GetChambered(int chamber) => _chambers[chamber].Slot.ContainedEntity; - - /// - /// Loads the next ammo casing into the chamber. - /// - protected virtual void CycleChamberedBullet(int chamber) { } - - public IEntity RemoveFromChamber(int chamber) - { - var c = _chambers[chamber]; - var loaded = c.Slot.ContainedEntity; - if (loaded != null) - { - c.Slot.Remove(loaded); - } - return loaded; - } - - protected bool LoadIntoChamber(int chamber, IEntity bullet) - { - if (!bullet.TryGetComponent(out BallisticBulletComponent component)) - { - throw new ArgumentException("entity isn't a bullet.", nameof(bullet)); - } - if (component.Caliber != _caliber) - { - throw new ArgumentException("entity is of the wrong caliber.", nameof(bullet)); - } - if (GetChambered(chamber) != null) - { - return false; - } - _chambers[chamber].Slot.Insert(bullet); - return true; - } - - private void PlayEmptySound() => EntitySystem.Get().PlayFromEntity(_soundGunEmpty, Owner); - - protected sealed class Chamber - { - public Chamber(ContainerSlot slot) - { - Slot = slot; - } - - public ContainerSlot Slot { get; } - } - - private const int FirstChamber = 0; - } -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs deleted file mode 100644 index cbf2958c5b..0000000000 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BaseProjectileWeaponComponent.cs +++ /dev/null @@ -1,99 +0,0 @@ -using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Projectiles; -using Robust.Server.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.Interfaces.GameObjects; -using Robust.Shared.Interfaces.Random; -using Robust.Shared.IoC; -using Robust.Shared.Map; -using Robust.Shared.Maths; -using Robust.Shared.Random; -using Robust.Shared.Serialization; -using Robust.Shared.ViewVariables; -using System.Collections.Generic; -using Robust.Server.GameObjects.EntitySystems; -using Robust.Shared.GameObjects.Systems; -using Robust.Shared.Physics; - -namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile -{ - /// - /// Methods to shoot projectiles. - /// - public abstract class BaseProjectileWeaponComponent : Component - { - private string _soundGunshot; - [ViewVariables(VVAccess.ReadWrite)] - public string SoundGunshot - { get => _soundGunshot; set => _soundGunshot = value; } - -#pragma warning disable 649 - [Dependency] private IRobustRandom _spreadRandom; -#pragma warning restore 649 - - public override void ExposeData(ObjectSerializer serializer) - { - base.ExposeData(serializer); - serializer.DataField(ref _soundGunshot, "sound_gunshot", "/Audio/Guns/Gunshots/smg.ogg"); - } - - /// - /// Fires projectile from an entity at a coordinate. - /// - protected void FireAtCoord(IEntity source, GridCoordinates coord, string projectileType, double spreadStdDev, int projectilesFired = 1, double evenSpreadAngle = 0, float velocity = 0) - { - var angle = GetAngleFromClickLocation(source, coord); - FireAtAngle(source, angle, projectileType, spreadStdDev, projectilesFired, evenSpreadAngle, velocity); - } - - /// - /// Fires projectile in the direction of an angle. - /// - protected void FireAtAngle(IEntity source, Angle angle, string projectileType = null, double spreadStdDev = 0, int projectilesFired = 1, double evenSpreadAngle = 0, float velocity = 0) - { - List sprayanglechange = null; - if (evenSpreadAngle != 0 & projectilesFired > 1) - { - sprayanglechange = Linspace(-evenSpreadAngle/2, evenSpreadAngle/2, projectilesFired); - } - for (var i = 1; i <= projectilesFired; i++) - { - Angle finalangle = angle + Angle.FromDegrees(_spreadRandom.NextGaussian(0, spreadStdDev)) + (sprayanglechange != null ? sprayanglechange[i - 1] : 0); - var projectile = Owner.EntityManager.SpawnEntity(projectileType, Owner.Transform.GridPosition); - projectile.Transform.GridPosition = source.Transform.GridPosition; //move projectile to entity it is being fired from - projectile.GetComponent().IgnoreEntity(source);//make sure it doesn't hit the source entity - var finalvelocity = projectile.GetComponent().Velocity + velocity;//add velocity - var physicsComponent = projectile.GetComponent(); - physicsComponent.Status = BodyStatus.InAir; - physicsComponent.LinearVelocity = finalangle.ToVec() * finalvelocity;//Rotate the bullets sprite to the correct direction - projectile.Transform.LocalRotation = finalangle.Theta; - } - PlayFireSound(); - if (source.TryGetComponent(out CameraRecoilComponent recoil)) - { - var recoilVec = angle.ToVec() * -0.15f; - recoil.Kick(recoilVec); - } - } - - private void PlayFireSound() => EntitySystem.Get().PlayFromEntity(_soundGunshot, Owner); - - /// - /// Gets the angle from an entity to a coordinate. - /// - protected Angle GetAngleFromClickLocation(IEntity source, GridCoordinates clickLocation) => new Angle(clickLocation.Position - source.Transform.GridPosition.Position); - - /// - /// Returns a list of numbers that form a set of equal intervals between the start and end value. Used to calculate shotgun spread angles. - /// - protected List Linspace(double start, double end, int intervals) - { - var linspace = new List { }; - for (var i = 0; i <= intervals - 1; i++) - { - linspace.Add(Angle.FromDegrees(start + (end - start) * i / (intervals - 1))); - } - return linspace; - } - } -} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs similarity index 65% rename from Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs rename to Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs index 60fbba1187..c6cb930c1a 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs @@ -1,6 +1,7 @@ -using System; +using System; using Content.Server.GameObjects.Components.Mobs; -using Content.Server.GameObjects.Components.Movement; +using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.EntitySystems; using Robust.Shared.GameObjects; @@ -8,13 +9,14 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Timing; using Robust.Shared.IoC; +using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Players; namespace Content.Server.GameObjects.Components.Weapon.Ranged { [RegisterComponent] - public sealed class RangedWeaponComponent : SharedRangedWeaponComponent + public sealed class ServerRangedWeaponComponent : SharedRangedWeaponComponent, IHandSelected { private TimeSpan _lastFireTime; @@ -22,6 +24,25 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged public Func UserCanFireHandler; public Action FireHandler; + public ServerRangedBarrelComponent Barrel + { + get => _barrel; + set + { + if (_barrel != null && value != null) + { + Logger.Error("Tried setting Barrel on RangedWeapon that already has one"); + throw new InvalidOperationException(); + } + + _barrel = value; + Dirty(); + } + } + private ServerRangedBarrelComponent _barrel; + + private FireRateSelector FireRateSelector => _barrel?.FireRateSelector ?? FireRateSelector.Safety; + private bool WeaponCanFire() { return WeaponCanFireHandler == null || WeaponCanFireHandler(); @@ -32,12 +53,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged return (UserCanFireHandler == null || UserCanFireHandler(user)) && ActionBlockerSystem.CanAttack(user); } - private void Fire(IEntity user, GridCoordinates clickLocation) - { - _lastFireTime = IoCManager.Resolve().CurTime; - FireHandler?.Invoke(user, clickLocation); - } - public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null) { base.HandleNetworkMessage(message, channel, session); @@ -49,7 +64,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged switch (message) { - case SyncFirePosMessage msg: + case FirePosComponentMessage msg: var user = session.AttachedEntity; if (user == null) { @@ -61,16 +76,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged } } - // Probably shouldn't be a separate method but don't want anything except NPCs calling this, - // and currently ranged combat is handled via player only messages - public void AiFire(IEntity entity, GridCoordinates coordinates) + public override ComponentState GetComponentState() { - if (!entity.HasComponent()) - { - throw new InvalidOperationException("Only AIs should call AiFire"); - } - - _tryFire(entity, coordinates); + return new RangedWeaponComponentState(FireRateSelector); } private void _tryFire(IEntity user, GridCoordinates coordinates) @@ -91,12 +99,19 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged var curTime = IoCManager.Resolve().CurTime; var span = curTime - _lastFireTime; - if (span.TotalSeconds < 1 / FireRate) + if (span.TotalSeconds < 1 / _barrel.FireRate) { return; } - Fire(user, coordinates); + _lastFireTime = curTime; + FireHandler?.Invoke(user, coordinates); + } + + // Probably a better way to do this. + void IHandSelected.HandSelected(HandSelectedEventArgs eventArgs) + { + Dirty(); } } } diff --git a/Content.Server/GameObjects/Components/Weapon/ServerFlashableComponent.cs b/Content.Server/GameObjects/Components/Weapon/ServerFlashableComponent.cs new file mode 100644 index 0000000000..4dfd7c50c1 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/ServerFlashableComponent.cs @@ -0,0 +1,78 @@ +using System; +using System.Linq; +using Content.Shared.GameObjects.Components.Weapons; +using Content.Shared.Physics; +using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Physics; +using Robust.Shared.Interfaces.Timing; +using Robust.Shared.IoC; +using Robust.Shared.Maths; + +namespace Content.Server.GameObjects.Components.Weapon +{ + [RegisterComponent] + public sealed class ServerFlashableComponent : SharedFlashableComponent + { + private double _duration; + private TimeSpan _lastFlash; + + public void Flash(double duration) + { + var timing = IoCManager.Resolve(); + _lastFlash = timing.CurTime; + _duration = duration; + Dirty(); + } + + public override ComponentState GetComponentState() + { + return new FlashComponentState(_duration, _lastFlash); + } + + public static void FlashAreaHelper(IEntity source, double range, double duration, string sound = null) + { + var physicsManager = IoCManager.Resolve(); + var entityManager = IoCManager.Resolve(); + + foreach (var entity in entityManager.GetEntities(new TypeEntityQuery(typeof(ServerFlashableComponent)))) + { + if (source.Transform.MapID != entity.Transform.MapID || + entity == source) + { + continue; + } + + var direction = entity.Transform.WorldPosition - source.Transform.WorldPosition; + + if (direction.Length > range) + { + continue; + } + + // Direction will be zero if they're hit with the source only I think + if (direction == Vector2.Zero) + { + continue; + } + + var ray = new CollisionRay(source.Transform.WorldPosition, direction.Normalized, (int) CollisionGroup.Opaque); + var rayCastResults = physicsManager.IntersectRay(source.Transform.MapID, ray, direction.Length, source, false).ToList(); + if (rayCastResults.Count == 0 || + rayCastResults[0].HitEntity != entity) + { + continue; + } + + var flashable = entity.GetComponent(); + flashable.Flash(duration); + } + + if (sound != null) + { + IoCManager.Resolve().GetEntitySystem().PlayAtCoords(sound, source.Transform.GridPosition); + } + } + } +} diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/CollidableMove.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/CollidableMove.cs deleted file mode 100644 index e5df90943d..0000000000 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/CollidableMove.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Robust.Shared.GameObjects.Components.Transform; - -namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.GraphUpdates -{ - public struct CollidableMove : IPathfindingGraphUpdate - { - public MoveEvent MoveEvent { get; } - - public CollidableMove(MoveEvent moveEvent) - { - MoveEvent = moveEvent; - } - } -} diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/CollisionChange.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/CollisionChange.cs deleted file mode 100644 index 0d7dde253a..0000000000 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/CollisionChange.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Robust.Shared.Interfaces.GameObjects; - -namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.GraphUpdates -{ - public class CollisionChange : IPathfindingGraphUpdate - { - public IEntity Owner { get; } - public bool Value { get; } - - public CollisionChange(IEntity owner, bool value) - { - Owner = owner; - Value = value; - } - } -} diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/GridRemoval.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/GridRemoval.cs deleted file mode 100644 index 30ee86f2aa..0000000000 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/GridRemoval.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Robust.Shared.Map; - -namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.GraphUpdates -{ - public struct GridRemoval : IPathfindingGraphUpdate - { - public GridId GridId { get; } - - public GridRemoval(GridId gridId) - { - GridId = gridId; - } - } -} diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/IPathfindingGraphUpdate.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/IPathfindingGraphUpdate.cs deleted file mode 100644 index 69aa5c1eac..0000000000 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/IPathfindingGraphUpdate.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.GraphUpdates -{ - public interface IPathfindingGraphUpdate - { - - } -} diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/TileUpdate.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/TileUpdate.cs deleted file mode 100644 index 501e4dabb8..0000000000 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/GraphUpdates/TileUpdate.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Robust.Shared.Map; - -namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.GraphUpdates -{ - public struct TileUpdate : IPathfindingGraphUpdate - { - public TileUpdate(TileRef tile) - { - Tile = tile; - } - - public TileRef Tile { get; } - } -} diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs index 1ac13372ad..e69b9e06d8 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs @@ -41,7 +41,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders } // If we couldn't get a nearby node that's good enough - if (!Utils.TryEndNode(ref _endNode, _pathfindingArgs)) + if (!PathfindingHelpers.TryEndNode(ref _endNode, _pathfindingArgs)) { return null; } @@ -88,9 +88,9 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders } // If tile is untraversable it'll be null - var tileCost = Utils.GetTileCost(_pathfindingArgs, currentNode, nextNode); + var tileCost = PathfindingHelpers.GetTileCost(_pathfindingArgs, currentNode, nextNode); - if (tileCost == null || !Utils.DirectionTraversable(_pathfindingArgs.CollisionMask, currentNode, direction)) + if (tileCost == null || !PathfindingHelpers.DirectionTraversable(_pathfindingArgs.CollisionMask, _pathfindingArgs.Access, currentNode, direction)) { continue; } @@ -107,7 +107,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders // pFactor is tie-breaker where the fscore is otherwise equal. // See http://theory.stanford.edu/~amitp/GameProgramming/Heuristics.html#breaking-ties // There's other ways to do it but future consideration - var fScore = gScores[nextNode] + Utils.OctileDistance(_endNode, nextNode) * (1.0f + 1.0f / 1000.0f); + var fScore = gScores[nextNode] + PathfindingHelpers.OctileDistance(_endNode, nextNode) * (1.0f + 1.0f / 1000.0f); openTiles.Add((fScore, nextNode)); } } @@ -117,7 +117,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders return null; } - var route = Utils.ReconstructPath(cameFrom, currentNode); + var route = PathfindingHelpers.ReconstructPath(cameFrom, currentNode); if (route.Count == 1) { diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs index 2b12b1b456..ffae0d7d89 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs @@ -41,7 +41,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders } // If we couldn't get a nearby node that's good enough - if (!Utils.TryEndNode(ref _endNode, _pathfindingArgs)) + if (!PathfindingHelpers.TryEndNode(ref _endNode, _pathfindingArgs)) { return null; } @@ -89,7 +89,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders jumpNodes.Add(jumpNode); #endif // GetJumpPoint should already check if we can traverse to the node - var tileCost = Utils.GetTileCost(_pathfindingArgs, currentNode, jumpNode); + var tileCost = PathfindingHelpers.GetTileCost(_pathfindingArgs, currentNode, jumpNode); if (tileCost == null) { @@ -108,7 +108,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders // pFactor is tie-breaker where the fscore is otherwise equal. // See http://theory.stanford.edu/~amitp/GameProgramming/Heuristics.html#breaking-ties // There's other ways to do it but future consideration - var fScore = gScores[jumpNode] + Utils.OctileDistance(_endNode, jumpNode) * (1.0f + 1.0f / 1000.0f); + var fScore = gScores[jumpNode] + PathfindingHelpers.OctileDistance(_endNode, jumpNode) * (1.0f + 1.0f / 1000.0f); openTiles.Add((fScore, jumpNode)); } } @@ -119,7 +119,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders return null; } - var route = Utils.ReconstructJumpPath(cameFrom, currentNode); + var route = PathfindingHelpers.ReconstructJumpPath(cameFrom, currentNode); if (route.Count == 1) { return null; @@ -161,7 +161,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders // We'll do opposite DirectionTraversable just because of how the method's setup // Nodes should be 2-way anyway. if (nextNode == null || - Utils.GetTileCost(_pathfindingArgs, currentNode, nextNode) == null) + PathfindingHelpers.GetTileCost(_pathfindingArgs, currentNode, nextNode) == null) { return null; } @@ -312,14 +312,14 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders throw new ArgumentOutOfRangeException(); } - if ((closedNeighborOne == null || Utils.GetTileCost(_pathfindingArgs, currentNode, closedNeighborOne) == null) - && openNeighborOne != null && Utils.GetTileCost(_pathfindingArgs, currentNode, openNeighborOne) != null) + if ((closedNeighborOne == null || PathfindingHelpers.GetTileCost(_pathfindingArgs, currentNode, closedNeighborOne) == null) + && openNeighborOne != null && PathfindingHelpers.GetTileCost(_pathfindingArgs, currentNode, openNeighborOne) != null) { return true; } - if ((closedNeighborTwo == null || Utils.GetTileCost(_pathfindingArgs, currentNode, closedNeighborTwo) == null) - && openNeighborTwo != null && Utils.GetTileCost(_pathfindingArgs, currentNode, openNeighborTwo) != null) + if ((closedNeighborTwo == null || PathfindingHelpers.GetTileCost(_pathfindingArgs, currentNode, closedNeighborTwo) == null) + && openNeighborTwo != null && PathfindingHelpers.GetTileCost(_pathfindingArgs, currentNode, openNeighborTwo) != null) { return true; } @@ -371,14 +371,14 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders throw new ArgumentOutOfRangeException(); } - if ((closedNeighborOne == null || !Utils.Traversable(_pathfindingArgs.CollisionMask, closedNeighborOne.CollisionMask)) && - (openNeighborOne != null && Utils.Traversable(_pathfindingArgs.CollisionMask, openNeighborOne.CollisionMask))) + if ((closedNeighborOne == null || !PathfindingHelpers.Traversable(_pathfindingArgs.CollisionMask, _pathfindingArgs.Access, closedNeighborOne)) && + (openNeighborOne != null && PathfindingHelpers.Traversable(_pathfindingArgs.CollisionMask, _pathfindingArgs.Access, openNeighborOne))) { return true; } - if ((closedNeighborTwo == null || !Utils.Traversable(_pathfindingArgs.CollisionMask, closedNeighborTwo.CollisionMask)) && - (openNeighborTwo != null && Utils.Traversable(_pathfindingArgs.CollisionMask, openNeighborTwo.CollisionMask))) + if ((closedNeighborTwo == null || !PathfindingHelpers.Traversable(_pathfindingArgs.CollisionMask, _pathfindingArgs.Access, closedNeighborTwo)) && + (openNeighborTwo != null && PathfindingHelpers.Traversable(_pathfindingArgs.CollisionMask, _pathfindingArgs.Access, openNeighborTwo))) { return true; } diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingArgs.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingArgs.cs index d2a01ea1ce..5b7e9ce3c6 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingArgs.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingArgs.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using Robust.Shared.GameObjects; using Robust.Shared.Map; @@ -6,6 +7,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders public struct PathfindingArgs { public EntityUid Uid { get; } + public ICollection Access { get; } public int CollisionMask { get; } public TileRef Start { get; } public TileRef End { get; } @@ -20,6 +22,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders public PathfindingArgs( EntityUid entityUid, + ICollection access, int collisionMask, TileRef start, TileRef end, @@ -29,6 +32,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders bool allowSpace = false) { Uid = entityUid; + Access = access; CollisionMask = collisionMask; Start = start; End = end; diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Utils.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs similarity index 79% rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Utils.cs rename to Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs index a72869db78..127c43a8d4 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Utils.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; using Content.Server.GameObjects.EntitySystems.Pathfinding; using Robust.Shared.Interfaces.GameObjects; @@ -10,19 +11,19 @@ using Robust.Shared.Maths; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { - public static class Utils + public static class PathfindingHelpers { public static bool TryEndNode(ref PathfindingNode endNode, PathfindingArgs pathfindingArgs) { - if (!Traversable(pathfindingArgs.CollisionMask, endNode.CollisionMask)) + if (!Traversable(pathfindingArgs.CollisionMask, pathfindingArgs.Access, endNode)) { if (pathfindingArgs.Proximity > 0.0f) { // TODO: Should make this account for proximities, // probably some kind of breadth-first search to find a valid one - foreach (var (direction, node) in endNode.Neighbors) + foreach (var (_, node) in endNode.Neighbors) { - if (Traversable(pathfindingArgs.CollisionMask, node.CollisionMask)) + if (Traversable(pathfindingArgs.CollisionMask, pathfindingArgs.Access, node)) { endNode = node; return true; @@ -36,7 +37,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding return true; } - public static bool DirectionTraversable(int collisionMask, PathfindingNode currentNode, Direction direction) + public static bool DirectionTraversable(int collisionMask, ICollection access, PathfindingNode currentNode, Direction direction) { // If it's a diagonal we need to check NSEW to see if we can get to it and stop corner cutting, NE needs N and E etc. // Given there's different collision layers stored for each node in the graph it's probably not worth it to cache this @@ -51,32 +52,32 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { case Direction.NorthEast: if (northNeighbor == null || eastNeighbor == null) return false; - if (!Traversable(collisionMask, northNeighbor.CollisionMask) || - !Traversable(collisionMask, eastNeighbor.CollisionMask)) + if (!Traversable(collisionMask, access, northNeighbor) || + !Traversable(collisionMask, access, eastNeighbor)) { return false; } break; case Direction.NorthWest: if (northNeighbor == null || westNeighbor == null) return false; - if (!Traversable(collisionMask, northNeighbor.CollisionMask) || - !Traversable(collisionMask, westNeighbor.CollisionMask)) + if (!Traversable(collisionMask, access, northNeighbor) || + !Traversable(collisionMask, access, westNeighbor)) { return false; } break; case Direction.SouthWest: if (southNeighbor == null || westNeighbor == null) return false; - if (!Traversable(collisionMask, southNeighbor.CollisionMask) || - !Traversable(collisionMask, westNeighbor.CollisionMask)) + if (!Traversable(collisionMask, access, southNeighbor) || + !Traversable(collisionMask, access, westNeighbor)) { return false; } break; case Direction.SouthEast: if (southNeighbor == null || eastNeighbor == null) return false; - if (!Traversable(collisionMask, southNeighbor.CollisionMask) || - !Traversable(collisionMask, eastNeighbor.CollisionMask)) + if (!Traversable(collisionMask, access, southNeighbor) || + !Traversable(collisionMask, access, eastNeighbor)) { return false; } @@ -86,11 +87,24 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding return true; } - public static bool Traversable(int collisionMask, int nodeMask) + public static bool Traversable(int collisionMask, ICollection access, PathfindingNode node) { - return (collisionMask & nodeMask) == 0; - } + if ((collisionMask & node.BlockedCollisionMask) != 0) + { + return false; + } + foreach (var reader in node.AccessReaders) + { + if (!reader.IsAllowed(access)) + { + return false; + } + } + + return true; + } + public static Queue ReconstructPath(Dictionary cameFrom, PathfindingNode current) { var running = new Stack(); @@ -194,6 +208,20 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding return 1.4f * dstX + (dstY - dstX); } + + public static float OctileDistance(TileRef endTile, TileRef startTile) + { + // "Fast Euclidean" / octile. + // This implementation is written down in a few sources; it just saves doing sqrt. + int dstX = Math.Abs(startTile.X - endTile.X); + int dstY = Math.Abs(startTile.Y - endTile.Y); + if (dstX > dstY) + { + return 1.4f * dstY + (dstX - dstY); + } + + return 1.4f * dstX + (dstY - dstX); + } public static float ManhattanDistance(PathfindingNode endNode, PathfindingNode currentNode) { @@ -202,7 +230,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding public static float? GetTileCost(PathfindingArgs pathfindingArgs, PathfindingNode start, PathfindingNode end) { - if (!pathfindingArgs.NoClip && !Traversable(pathfindingArgs.CollisionMask, end.CollisionMask)) + if (!pathfindingArgs.NoClip && !Traversable(pathfindingArgs.CollisionMask, pathfindingArgs.Access, end)) { return null; } diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs index b9b110a566..262631a4b3 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs @@ -1,6 +1,12 @@ using System; using System.Collections.Generic; +using Content.Server.GameObjects.Components.Access; +using Content.Server.GameObjects.Components.Doors; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; +using Robust.Server.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Components; +using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Map; using Robust.Shared.Maths; @@ -8,27 +14,34 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding { public class PathfindingNode { - // TODO: Add access ID here public PathfindingChunk ParentChunk => _parentChunk; private readonly PathfindingChunk _parentChunk; - public TileRef TileRef { get; private set; } - public List CollisionLayers { get; } - public int CollisionMask { get; private set; } + public Dictionary Neighbors => _neighbors; private Dictionary _neighbors = new Dictionary(); + + public TileRef TileRef { get; private set; } + + /// + /// Whenever there's a change in the collision layers we update the mask as the graph has more reads than writes + /// + public int BlockedCollisionMask { get; private set; } + private readonly Dictionary _blockedCollidables = new Dictionary(0); - public PathfindingNode(PathfindingChunk parent, TileRef tileRef, List collisionLayers = null) + public IReadOnlyCollection PhysicsUids => _physicsUids; + private readonly HashSet _physicsUids = new HashSet(0); + + /// + /// The entities on this tile that require access to traverse + /// + /// We don't store the ICollection, at least for now, as we'd need to replicate the access code here + public IReadOnlyCollection AccessReaders => _accessReaders.Values; + private readonly Dictionary _accessReaders = new Dictionary(0); + + public PathfindingNode(PathfindingChunk parent, TileRef tileRef) { _parentChunk = parent; TileRef = tileRef; - if (collisionLayers == null) - { - CollisionLayers = new List(); - } - else - { - CollisionLayers = collisionLayers; - } GenerateMask(); } @@ -105,25 +118,70 @@ namespace Content.Server.GameObjects.EntitySystems.Pathfinding TileRef = newTile; } - public void AddCollisionLayer(int layer) + /// + /// Call if this entity is relevant for the pathfinder + /// + /// + /// TODO: These 2 methods currently don't account for a bunch of changes (e.g. airlock unpowered, wrenching, etc.) + public void AddEntity(IEntity entity) { - CollisionLayers.Add(layer); - GenerateMask(); + // If we're a door + if (entity.HasComponent() || entity.HasComponent()) + { + // If we need access to traverse this then add to readers, otherwise no point adding it (except for maybe tile costs in future) + // TODO: Check for powered I think (also need an event for when it's depowered + // AccessReader calls this whenever opening / closing but it can seem to get called multiple times + // Which may or may not be intended? + if (entity.TryGetComponent(out AccessReader accessReader) && !_accessReaders.ContainsKey(entity.Uid)) + { + _accessReaders.Add(entity.Uid, accessReader); + } + return; + } + + if (entity.TryGetComponent(out CollidableComponent collidableComponent)) + { + if (entity.TryGetComponent(out PhysicsComponent physicsComponent) && !physicsComponent.Anchored) + { + _physicsUids.Add(entity.Uid); + } + else + { + _blockedCollidables.TryAdd(entity.Uid, collidableComponent.CollisionLayer); + GenerateMask(); + } + } } - public void RemoveCollisionLayer(int layer) + public void RemoveEntity(IEntity entity) { - CollisionLayers.Remove(layer); - GenerateMask(); + if (_accessReaders.ContainsKey(entity.Uid)) + { + _accessReaders.Remove(entity.Uid); + return; + } + + if (entity.HasComponent()) + { + if (entity.TryGetComponent(out PhysicsComponent physicsComponent) && physicsComponent.Anchored) + { + _blockedCollidables.Remove(entity.Uid); + GenerateMask(); + } + else + { + _physicsUids.Remove(entity.Uid); + } + } } private void GenerateMask() { - CollisionMask = 0x0; + BlockedCollisionMask = 0x0; - foreach (var layer in CollisionLayers) + foreach (var layer in _blockedCollidables.Values) { - CollisionMask |= layer; + BlockedCollisionMask |= layer; } } } diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs index 490f909f7d..62a8479306 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Threading; -using Content.Server.GameObjects.Components.Doors; -using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.GraphUpdates; +using Content.Server.GameObjects.Components.Access; using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders; using Content.Server.GameObjects.EntitySystems.JobQueues; using Content.Server.GameObjects.EntitySystems.JobQueues.Queues; using Content.Server.GameObjects.EntitySystems.Pathfinding; +using Content.Shared.Physics; using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Systems; @@ -14,6 +14,7 @@ using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; using Robust.Shared.Map; +using Robust.Shared.Utility; namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { @@ -29,18 +30,30 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding public class PathfindingSystem : EntitySystem { #pragma warning disable 649 + [Dependency] private readonly IEntityManager _entitymanager; [Dependency] private readonly IMapManager _mapManager; #pragma warning restore 649 public IReadOnlyDictionary> Graph => _graph; private readonly Dictionary> _graph = new Dictionary>(); - // Every tick we queue up all the changes and do them at once - private readonly Queue _queuedGraphUpdates = new Queue(); + private readonly PathfindingJobQueue _pathfindingQueue = new PathfindingJobQueue(); + + // Queued pathfinding graph updates + private readonly Queue _collidableUpdateQueue = new Queue(); + private readonly Queue _moveUpdateQueue = new Queue(); + private readonly Queue _accessReaderUpdateQueue = new Queue(); + private readonly Queue _tileUpdateQueue = new Queue(); // Need to store previously known entity positions for collidables for when they move private readonly Dictionary _lastKnownPositions = new Dictionary(); + public const int TrackedCollisionLayers = (int) + (CollisionGroup.Impassable | + CollisionGroup.MobImpassable | + CollisionGroup.SmallImpassable | + CollisionGroup.VaultImpassable); + /// /// Ask for the pathfinder to gimme somethin /// @@ -68,51 +81,66 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding private void ProcessGraphUpdates() { - for (var i = 0; i < Math.Min(50, _queuedGraphUpdates.Count); i++) + var totalUpdates = 0; + + foreach (var update in _collidableUpdateQueue) { - var update = _queuedGraphUpdates.Dequeue(); - switch (update) + var entity = _entitymanager.GetEntity(update.Owner); + if (update.CanCollide) { - case CollidableMove move: - HandleCollidableMove(move); - break; - case CollisionChange change: - if (change.Value) - { - HandleCollidableAdd(change.Owner); - } - else - { - HandleCollidableRemove(change.Owner); - } - - break; - case GridRemoval removal: - HandleGridRemoval(removal); - break; - case TileUpdate tile: - HandleTileUpdate(tile); - break; - default: - throw new ArgumentOutOfRangeException(); + HandleCollidableAdd(entity); + } + else + { + HandleAccessRemove(entity); } - } - } - private void HandleGridRemoval(GridRemoval removal) - { - if (!_graph.ContainsKey(removal.GridId)) + totalUpdates++; + } + + _collidableUpdateQueue.Clear(); + + foreach (var update in _accessReaderUpdateQueue) { - throw new InvalidOperationException(); + var entity = _entitymanager.GetEntity(update.Uid); + if (update.Enabled) + { + HandleAccessAdd(entity); + } + else + { + HandleAccessRemove(entity); + } + + totalUpdates++; + } + + _accessReaderUpdateQueue.Clear(); + + foreach (var tile in _tileUpdateQueue) + { + HandleTileUpdate(tile); + totalUpdates++; + } + + _tileUpdateQueue.Clear(); + var moveUpdateCount = Math.Max(50 - totalUpdates, 0); + + // Other updates are high priority so for this we'll just defer it if there's a spike (explosion, etc.) + // If the move updates grow too large then we'll just do it + if (_moveUpdateQueue.Count > 100) + { + moveUpdateCount = _moveUpdateQueue.Count - 100; } - _graph.Remove(removal.GridId); - } - - private void HandleTileUpdate(TileUpdate tile) - { - var chunk = GetChunk(tile.Tile); - chunk.UpdateNode(tile.Tile); + moveUpdateCount = Math.Min(moveUpdateCount, _moveUpdateQueue.Count); + + for (var i = 0; i < moveUpdateCount; i++) + { + HandleCollidableMove(_moveUpdateQueue.Dequeue()); + } + + DebugTools.Assert(_moveUpdateQueue.Count < 1000); } public PathfindingChunk GetChunk(TileRef tile) @@ -132,7 +160,6 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding } var newChunk = CreateChunk(tile.GridIndex, mapIndices); - return newChunk; } @@ -179,13 +206,13 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding public override void Initialize() { - IoCManager.InjectDependencies(this); SubscribeLocalEvent(QueueCollisionEnabledEvent); SubscribeLocalEvent(QueueCollidableMove); + SubscribeLocalEvent(QueueAccessChangeEvent); // Handle all the base grid changes // Anything that affects traversal (i.e. collision layer) is handled separately. - _mapManager.OnGridRemoved += QueueGridRemoval; + _mapManager.OnGridRemoved += HandleGridRemoval; _mapManager.GridChanged += QueueGridChange; _mapManager.TileChanged += QueueTileChange; } @@ -193,27 +220,85 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding public override void Shutdown() { base.Shutdown(); - _mapManager.OnGridRemoved -= QueueGridRemoval; + UnsubscribeLocalEvent(); + UnsubscribeLocalEvent(); + UnsubscribeLocalEvent(); + + _mapManager.OnGridRemoved -= HandleGridRemoval; _mapManager.GridChanged -= QueueGridChange; _mapManager.TileChanged -= QueueTileChange; } - - private void QueueGridRemoval(GridId gridId) + + private void HandleTileUpdate(TileRef tile) { - _queuedGraphUpdates.Enqueue(new GridRemoval(gridId)); + var node = GetNode(tile); + node.UpdateTile(tile); + } + + public void ResettingCleanup() + { + _graph.Clear(); + _collidableUpdateQueue.Clear(); + _moveUpdateQueue.Clear(); + _accessReaderUpdateQueue.Clear(); + _tileUpdateQueue.Clear(); + _lastKnownPositions.Clear(); + } + + private void HandleGridRemoval(GridId gridId) + { + if (_graph.ContainsKey(gridId)) + { + _graph.Remove(gridId); + } } private void QueueGridChange(object sender, GridChangedEventArgs eventArgs) { foreach (var (position, _) in eventArgs.Modified) { - _queuedGraphUpdates.Enqueue(new TileUpdate(eventArgs.Grid.GetTileRef(position))); + _tileUpdateQueue.Enqueue(eventArgs.Grid.GetTileRef(position)); } } private void QueueTileChange(object sender, TileChangedEventArgs eventArgs) { - _queuedGraphUpdates.Enqueue(new TileUpdate(eventArgs.NewTile)); + _tileUpdateQueue.Enqueue(eventArgs.NewTile); + } + + private void QueueAccessChangeEvent(AccessReaderChangeMessage message) + { + _accessReaderUpdateQueue.Enqueue(message); + } + + private void HandleAccessAdd(IEntity entity) + { + if (entity.Deleted || !entity.HasComponent()) + { + return; + } + + var grid = _mapManager.GetGrid(entity.Transform.GridID); + var tileRef = grid.GetTileRef(entity.Transform.GridPosition); + + var chunk = GetChunk(tileRef); + var node = chunk.GetNode(tileRef); + node.AddEntity(entity); + } + + private void HandleAccessRemove(IEntity entity) + { + if (entity.Deleted || !entity.HasComponent()) + { + return; + } + + var grid = _mapManager.GetGrid(entity.Transform.GridID); + var tileRef = grid.GetTileRef(entity.Transform.GridPosition); + + var chunk = GetChunk(tileRef); + var node = chunk.GetNode(tileRef); + node.RemoveEntity(entity); } #region collidable @@ -223,25 +308,22 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding /// private void HandleCollidableAdd(IEntity entity) { - // It's a grid / gone / a door / we already have it (which probably shouldn't happen) if (entity.Prototype == null || entity.Deleted || - entity.HasComponent() || - entity.HasComponent() || - _lastKnownPositions.ContainsKey(entity)) + _lastKnownPositions.ContainsKey(entity) || + !entity.TryGetComponent(out CollidableComponent collidableComponent) || + !collidableComponent.CanCollide || + (TrackedCollisionLayers & collidableComponent.CollisionLayer) == 0) { return; } var grid = _mapManager.GetGrid(entity.Transform.GridID); var tileRef = grid.GetTileRef(entity.Transform.GridPosition); - - var collisionLayer = entity.GetComponent().CollisionLayer; - var chunk = GetChunk(tileRef); var node = chunk.GetNode(tileRef); - node.AddCollisionLayer(collisionLayer); + node.AddEntity(entity); _lastKnownPositions.Add(entity, tileRef); } @@ -253,46 +335,37 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { if (entity.Prototype == null || entity.Deleted || - entity.HasComponent() || - entity.HasComponent() || - !_lastKnownPositions.ContainsKey(entity)) + !_lastKnownPositions.ContainsKey(entity) || + !entity.TryGetComponent(out CollidableComponent collidableComponent) || + !collidableComponent.CanCollide || + (TrackedCollisionLayers & collidableComponent.CollisionLayer) == 0) { return; } - _lastKnownPositions.Remove(entity); - var grid = _mapManager.GetGrid(entity.Transform.GridID); var tileRef = grid.GetTileRef(entity.Transform.GridPosition); - - if (!entity.TryGetComponent(out CollidableComponent collidableComponent)) - { - return; - } - - var collisionLayer = collidableComponent.CollisionLayer; - var chunk = GetChunk(tileRef); var node = chunk.GetNode(tileRef); - node.RemoveCollisionLayer(collisionLayer); + + node.RemoveEntity(entity); + _lastKnownPositions.Remove(entity); } private void QueueCollidableMove(MoveEvent moveEvent) { - _queuedGraphUpdates.Enqueue(new CollidableMove(moveEvent)); + _moveUpdateQueue.Enqueue(moveEvent); } - private void HandleCollidableMove(CollidableMove move) + private void HandleCollidableMove(MoveEvent moveEvent) { - if (!_lastKnownPositions.ContainsKey(move.MoveEvent.Sender)) + if (!_lastKnownPositions.ContainsKey(moveEvent.Sender)) { return; } // The pathfinding graph is tile-based so first we'll check if they're on a different tile and if we need to update. // If you get entities bigger than 1 tile wide you'll need some other system so god help you. - var moveEvent = move.MoveEvent; - if (moveEvent.Sender.Deleted) { HandleCollidableRemove(moveEvent.Sender); @@ -309,14 +382,12 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding _lastKnownPositions[moveEvent.Sender] = newTile; - if (!moveEvent.Sender.TryGetComponent(out CollidableComponent collidableComponent)) + if (!moveEvent.Sender.HasComponent()) { HandleCollidableRemove(moveEvent.Sender); return; } - var collisionLayer = collidableComponent.CollisionLayer; - var gridIds = new HashSet(2) {oldTile.GridIndex, newTile.GridIndex}; foreach (var gridId in gridIds) @@ -325,33 +396,53 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding { var oldChunk = GetChunk(oldTile); var oldNode = oldChunk.GetNode(oldTile); - oldNode.RemoveCollisionLayer(collisionLayer); + oldNode.RemoveEntity(moveEvent.Sender); } if (newTile.GridIndex == gridId) { var newChunk = GetChunk(newTile); var newNode = newChunk.GetNode(newTile); - newNode.RemoveCollisionLayer(collisionLayer); + newNode.AddEntity(moveEvent.Sender); } } } private void QueueCollisionEnabledEvent(CollisionChangeEvent collisionEvent) { - // TODO: Handle containers - var entityManager = IoCManager.Resolve(); - var entity = entityManager.GetEntity(collisionEvent.Owner); - switch (collisionEvent.CanCollide) - { - case true: - _queuedGraphUpdates.Enqueue(new CollisionChange(entity, true)); - break; - case false: - _queuedGraphUpdates.Enqueue(new CollisionChange(entity, false)); - break; - } + _collidableUpdateQueue.Enqueue(collisionEvent); } #endregion + + // TODO: Need to rethink the pathfinder utils (traversable etc.). Maybe just chuck them all in PathfindingSystem + // Otherwise you get the steerer using this and the pathfinders using a different traversable. + // Also look at increasing tile cost the more physics entities are on it + public bool CanTraverse(IEntity entity, GridCoordinates grid) + { + var tile = _mapManager.GetGrid(grid.GridID).GetTileRef(grid); + var node = GetNode(tile); + return CanTraverse(entity, node); + } + + public bool CanTraverse(IEntity entity, PathfindingNode node) + { + if (entity.TryGetComponent(out CollidableComponent collidableComponent) && + (collidableComponent.CollisionMask & node.BlockedCollisionMask) != 0) + { + return false; + } + + var access = AccessReader.FindAccessTags(entity); + + foreach (var reader in node.AccessReaders) + { + if (!reader.IsAllowed(access)) + { + return false; + } + } + + return true; + } } } diff --git a/Content.Server/GameObjects/EntitySystems/ActSystem.cs b/Content.Server/GameObjects/EntitySystems/ActSystem.cs index 035cac5218..56be8389ea 100644 --- a/Content.Server/GameObjects/EntitySystems/ActSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/ActSystem.cs @@ -102,8 +102,8 @@ namespace Content.Server.GameObjects.EntitySystems } public enum ExplosionSeverity { - Destruction, - Heavy, Light, + Heavy, + Destruction, } } diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index 66692a5543..c92df5fcc5 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Timing; @@ -955,22 +955,34 @@ namespace Content.Server.GameObjects.EntitySystems return; } - // Verify player has a hand, and find what object he is currently holding in his active hand - if (!player.TryGetComponent(out var hands)) - { - return; - } - - var item = hands.GetActiveHand?.Owner; - - // TODO: If item is null we need some kinda unarmed combat. - if (!ActionBlockerSystem.CanAttack(player) || item == null) + if (!ActionBlockerSystem.CanAttack(player)) { return; } var eventArgs = new AttackEventArgs(player, coordinates); - foreach (var attackComponent in item.GetAllComponents()) + + // Verify player has a hand, and find what object he is currently holding in his active hand + if (player.TryGetComponent(out var hands)) + { + var item = hands.GetActiveHand?.Owner; + + if (item != null) + { + var attacked = false; + foreach (var attackComponent in item.GetAllComponents()) + { + attackComponent.Attack(eventArgs); + attacked = true; + } + if (attacked) + { + return; + } + } + } + + foreach (var attackComponent in player.GetAllComponents()) { attackComponent.Attack(eventArgs); } diff --git a/Content.Server/GameObjects/EntitySystems/WeaponCapacitorChargerSystem.cs b/Content.Server/GameObjects/EntitySystems/WeaponCapacitorChargerSystem.cs index 199489d339..4e86b35857 100644 --- a/Content.Server/GameObjects/EntitySystems/WeaponCapacitorChargerSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/WeaponCapacitorChargerSystem.cs @@ -23,4 +23,4 @@ namespace Content.Server.GameObjects.EntitySystems } } } -} +} \ No newline at end of file diff --git a/Content.Server/GameTicking/GamePreset.cs b/Content.Server/GameTicking/GamePreset.cs index 0075f7ae1b..5b4fdadf2d 100644 --- a/Content.Server/GameTicking/GamePreset.cs +++ b/Content.Server/GameTicking/GamePreset.cs @@ -8,7 +8,7 @@ namespace Content.Server.GameTicking /// public abstract class GamePreset { - public abstract bool Start(IReadOnlyList players); + public abstract bool Start(IReadOnlyList readyPlayers, bool force = false); public virtual string ModeTitle => "Sandbox"; public virtual string Description => "Secret!"; } diff --git a/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs b/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs index f45fa125b3..04e663b6da 100644 --- a/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs +++ b/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs @@ -12,7 +12,7 @@ namespace Content.Server.GameTicking.GamePresets [Dependency] private readonly IGameTicker _gameTicker; #pragma warning restore 649 - public override bool Start(IReadOnlyList readyPlayers) + public override bool Start(IReadOnlyList readyPlayers, bool force = false) { _gameTicker.AddGameRule(); return true; diff --git a/Content.Server/GameTicking/GamePresets/PresetSandbox.cs b/Content.Server/GameTicking/GamePresets/PresetSandbox.cs index 2eeab4a049..7ceebaf108 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSandbox.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSandbox.cs @@ -11,7 +11,7 @@ namespace Content.Server.GameTicking.GamePresets [Dependency] private readonly ISandboxManager _sandboxManager; #pragma warning restore 649 - public override bool Start(IReadOnlyList readyPlayers) + public override bool Start(IReadOnlyList readyPlayers, bool force = false) { _sandboxManager.IsSandboxEnabled = true; return true; diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs index 4616888dd5..b59e7d7ae5 100644 --- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs +++ b/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using Content.Server.GameTicking.GameRules; using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.GameTicking; @@ -28,16 +27,17 @@ namespace Content.Server.GameTicking.GamePresets public int MinTraitors { get; set; } = 2; public int PlayersPerTraitor { get; set; } = 5; - public override bool Start(IReadOnlyList readyPlayers) + public override bool Start(IReadOnlyList readyPlayers, bool force = false) { - if (readyPlayers.Count < MinPlayers) + if (!force && readyPlayers.Count < MinPlayers) { _chatManager.DispatchServerAnnouncement($"Not enough players readied up for the game! There were {readyPlayers.Count} players readied up out of {MinPlayers} needed."); return false; } var list = new List(readyPlayers); - var numTraitors = Math.Max(readyPlayers.Count() % PlayersPerTraitor, MinTraitors); + var numTraitors = Math.Clamp(readyPlayers.Count % PlayersPerTraitor, + MinTraitors, readyPlayers.Count); for (var i = 0; i < numTraitors; i++) { diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 1bee0eab26..51b0136957 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -9,6 +9,7 @@ using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Observer; using Content.Server.GameObjects.Components.PDA; using Content.Server.GameObjects.EntitySystems; +using Content.Server.GameObjects.EntitySystems.AI.Pathfinding; using Content.Server.GameTicking.GamePresets; using Content.Server.Interfaces; using Content.Server.Interfaces.Chat; @@ -80,6 +81,7 @@ namespace Content.Server.GameTicking [ViewVariables] private Type _presetType; + [ViewVariables] private DateTime _pauseTime; [ViewVariables] private bool _roundStartCountdownHasNotStartedYetDueToNoPlayers; private DateTime _roundStartTimeUtc; [ViewVariables] private GameRunLevel _runLevel; @@ -91,6 +93,8 @@ namespace Content.Server.GameTicking private CancellationTokenSource _updateShutdownCts; + [ViewVariables] public bool Paused { get; private set; } + [ViewVariables] public GameRunLevel RunLevel { @@ -127,6 +131,7 @@ namespace Content.Server.GameTicking _netManager.RegisterNetMessage(nameof(MsgTickerJoinGame)); _netManager.RegisterNetMessage(nameof(MsgTickerLobbyStatus)); _netManager.RegisterNetMessage(nameof(MsgTickerLobbyInfo)); + _netManager.RegisterNetMessage(nameof(MsgTickerLobbyCountdown)); _netManager.RegisterNetMessage(nameof(MsgRoundEndMessage)); SetStartPreset(_configurationManager.GetCVar("game.defaultpreset")); @@ -155,9 +160,13 @@ namespace Content.Server.GameTicking RoundLengthMetric.Inc(frameEventArgs.DeltaSeconds); } - if (RunLevel != GameRunLevel.PreRoundLobby || _roundStartTimeUtc > DateTime.UtcNow || + if (RunLevel != GameRunLevel.PreRoundLobby || + Paused || + _roundStartTimeUtc > DateTime.UtcNow || _roundStartCountdownHasNotStartedYetDueToNoPlayers) + { return; + } StartRound(); } @@ -196,7 +205,7 @@ namespace Content.Server.GameTicking } } - public void StartRound() + public void StartRound(bool force = false) { DebugTools.Assert(RunLevel == GameRunLevel.PreRoundLobby); Logger.InfoS("ticker", "Starting round!"); @@ -246,13 +255,15 @@ namespace Content.Server.GameTicking // Time to start the preset. var preset = MakeGamePreset(); - if (!preset.Start(assignedJobs.Keys.ToList())) + if (!preset.Start(assignedJobs.Keys.ToList(), force)) { SetStartPreset(_configurationManager.GetCVar("game.fallbackpreset")); var newPreset = MakeGamePreset(); _chatManager.DispatchServerAnnouncement($"Failed to start {preset.ModeTitle} mode! Defaulting to {newPreset.ModeTitle}..."); - if(!newPreset.Start(readyPlayers)) + if (!newPreset.Start(readyPlayers, force)) + { throw new ApplicationException("Fallback preset failed to start!"); + } } _roundStartTimeSpan = IoCManager.Resolve().RealTime; @@ -296,7 +307,7 @@ namespace Content.Server.GameTicking { PlayerOOCName = ply.Name, PlayerICName = mind.CurrentEntity.Name, - Role = antag ? mind.AllRoles.First(role => role.Antag).Name : mind.AllRoles.FirstOrDefault()?.Name ?? Loc.GetString("Unkown"), + Role = antag ? mind.AllRoles.First(role => role.Antag).Name : mind.AllRoles.FirstOrDefault()?.Name ?? Loc.GetString("Unknown"), Antag = antag }; listOfPlayerInfo.Add(playerEndRoundInfo); @@ -376,30 +387,105 @@ namespace Content.Server.GameTicking public IEnumerable ActiveGameRules => _gameRules; - public void SetStartPreset(Type type) + public bool TryGetPreset(string name, out Type type) + { + type = name.ToLower() switch + { + "sandbox" => typeof(PresetSandbox), + "deathmatch" => typeof(PresetDeathMatch), + "suspicion" => typeof(PresetSuspicion), + _ => default + }; + + return type != default; + } + + public void SetStartPreset(Type type, bool force = false) { if (!typeof(GamePreset).IsAssignableFrom(type)) throw new ArgumentException("type must inherit GamePreset"); _presetType = type; UpdateInfoText(); + + if (force) + { + StartRound(true); + } } - public void SetStartPreset(string type) => - SetStartPreset(type switch + public void SetStartPreset(string name, bool force = false) + { + if (!TryGetPreset(name, out var type)) { - "Sandbox" => typeof(PresetSandbox), - "DeathMatch" => typeof(PresetDeathMatch), - "Suspicion" => typeof(PresetSuspicion), - _ => throw new NotSupportedException() - }); + throw new NotSupportedException(); + } + + SetStartPreset(type, force); + } + + public bool DelayStart(TimeSpan time) + { + if (_runLevel != GameRunLevel.PreRoundLobby) + { + return false; + } + + _roundStartTimeUtc += time; + + var lobbyCountdownMessage = _netManager.CreateNetMessage(); + lobbyCountdownMessage.StartTime = _roundStartTimeUtc; + lobbyCountdownMessage.Paused = Paused; + _netManager.ServerSendToAll(lobbyCountdownMessage); + + _chatManager.DispatchServerAnnouncement($"Round start has been delayed for {time.TotalSeconds} seconds."); + + return true; + } + + public bool PauseStart(bool pause = true) + { + if (Paused == pause) + { + return false; + } + + Paused = pause; + + if (pause) + { + _pauseTime = DateTime.UtcNow; + } + else if (_pauseTime != default) + { + _roundStartTimeUtc += DateTime.UtcNow - _pauseTime; + } + + var lobbyCountdownMessage = _netManager.CreateNetMessage(); + lobbyCountdownMessage.StartTime = _roundStartTimeUtc; + lobbyCountdownMessage.Paused = Paused; + _netManager.ServerSendToAll(lobbyCountdownMessage); + + _chatManager.DispatchServerAnnouncement(Paused + ? "Round start has been paused." + : "Round start countdown is now resumed."); + + return true; + } + + public bool TogglePause() + { + PauseStart(!Paused); + return Paused; + } private IEntity _spawnPlayerMob(Job job, bool lateJoin = true) { GridCoordinates coordinates = lateJoin ? GetLateJoinSpawnPoint() : GetJobSpawnPoint(job.Prototype.ID); var entity = _entityManager.SpawnEntity(PlayerPrototypeName, coordinates); + var startingGear = _prototypeManager.Index(job.StartingGear); if (entity.TryGetComponent(out InventoryComponent inventory)) { - var gear = _prototypeManager.Index(job.StartingGear).Equipment; + var gear = startingGear.Equipment; foreach (var (slot, equipmentStr) in gear) { @@ -408,6 +494,16 @@ namespace Content.Server.GameTicking } } + if (entity.TryGetComponent(out HandsComponent handsComponent)) + { + var inhand = startingGear.Inhand; + foreach (var (hand, prototype) in inhand) + { + var inhandEntity = _entityManager.SpawnEntity(prototype, entity.Transform.GridPosition); + handsComponent.PutInHand(inhandEntity.GetComponent(), hand); + } + } + return entity; } @@ -506,6 +602,9 @@ namespace Content.Server.GameTicking _playerJoinLobby(player); } + // Reset pathing system + EntitySystem.Get().ResettingCleanup(); + _spawnedPositions.Clear(); _manifest.Clear(); @@ -745,6 +844,7 @@ namespace Content.Server.GameTicking msg.IsRoundStarted = RunLevel != GameRunLevel.PreRoundLobby; msg.StartTime = _roundStartTimeUtc; msg.YouAreReady = ready; + msg.Paused = Paused; return msg; } diff --git a/Content.Server/GameTicking/GameTickerCommands.cs b/Content.Server/GameTicking/GameTickerCommands.cs index 3308b1f922..0c12e593c5 100644 --- a/Content.Server/GameTicking/GameTickerCommands.cs +++ b/Content.Server/GameTicking/GameTickerCommands.cs @@ -9,6 +9,47 @@ using Robust.Shared.Network; namespace Content.Server.GameTicking { + class DelayStartCommand : IClientCommand + { + public string Command => "delaystart"; + public string Description => "Delays the round start."; + public string Help => $"Usage: {Command} \nPauses/Resumes the countdown if no argument is provided."; + + public void Execute(IConsoleShell shell, IPlayerSession player, string[] args) + { + var ticker = IoCManager.Resolve(); + if (ticker.RunLevel != GameRunLevel.PreRoundLobby) + { + shell.SendText(player, "This can only be executed while the game is in the pre-round lobby."); + return; + } + + if (args.Length == 0) + { + var paused = ticker.TogglePause(); + shell.SendText(player, paused ? "Paused the countdown." : "Resumed the countdown."); + return; + } + + if (args.Length != 1) + { + shell.SendText(player, "Need zero or one arguments."); + return; + } + + if (!uint.TryParse(args[0], out var seconds) || seconds == 0) + { + shell.SendText(player, $"{args[0]} isn't a valid amount of seconds."); + return; + } + + var time = TimeSpan.FromSeconds(seconds); + if (!ticker.DelayStart(time)) + { + shell.SendText(player, "An unknown error has occurred."); + } + } + } class StartRoundCommand : IClientCommand { @@ -193,4 +234,37 @@ namespace Content.Server.GameTicking ticker.SetStartPreset(args[0]); } } + + class ForcePresetCommand : IClientCommand + { + public string Command => "forcepreset"; + public string Description => "Forces a specific game preset to start for the current lobby."; + public string Help => $"Usage: {Command} "; + + public void Execute(IConsoleShell shell, IPlayerSession player, string[] args) + { + var ticker = IoCManager.Resolve(); + if (ticker.RunLevel != GameRunLevel.PreRoundLobby) + { + shell.SendText(player, "This can only be executed while the game is in the pre-round lobby."); + return; + } + + if (args.Length != 1) + { + shell.SendText(player, "Need exactly one argument."); + return; + } + + var name = args[0]; + if (!ticker.TryGetPreset(name, out var type)) + { + shell.SendText(player, $"No preset exists with name {name}."); + return; + } + + ticker.SetStartPreset(type, true); + shell.SendText(player, $"Forced the game to start with preset {name}."); + } + } } diff --git a/Content.Server/GlobalVerbs/RejuvenateVerb.cs b/Content.Server/GlobalVerbs/RejuvenateVerb.cs index cf141019b6..3c2c69da6f 100644 --- a/Content.Server/GlobalVerbs/RejuvenateVerb.cs +++ b/Content.Server/GlobalVerbs/RejuvenateVerb.cs @@ -1,4 +1,5 @@ using Content.Server.GameObjects; +using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Nutrition; using Content.Shared.GameObjects; using Robust.Server.Console; @@ -62,6 +63,10 @@ namespace Content.Server.GlobalVerbs { thirst.ResetThirst(); } + if (target.TryGetComponent(out StunnableComponent stun)) + { + stun.ResetStuns(); + } } } } diff --git a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs index 14d6225851..341106539f 100644 --- a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs +++ b/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Content.Server.GameObjects; +using Content.Shared.GameObjects.EntitySystems; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystemMessages; using Robust.Shared.Interfaces.GameObjects; diff --git a/Content.Server/Interfaces/GameTicking/IGameTicker.cs b/Content.Server/Interfaces/GameTicking/IGameTicker.cs index 56e04a84ef..b0eadb8094 100644 --- a/Content.Server/Interfaces/GameTicking/IGameTicker.cs +++ b/Content.Server/Interfaces/GameTicking/IGameTicker.cs @@ -21,7 +21,7 @@ namespace Content.Server.Interfaces.GameTicking void Update(FrameEventArgs frameEventArgs); void RestartRound(); - void StartRound(); + void StartRound(bool force = false); void EndRound(); void Respawn(IPlayerSession targetPlayer); @@ -39,7 +39,16 @@ namespace Content.Server.Interfaces.GameTicking void RemoveGameRule(GameRule rule); IEnumerable ActiveGameRules { get; } - void SetStartPreset(Type type); - void SetStartPreset(string type); + bool TryGetPreset(string name, out Type type); + void SetStartPreset(Type type, bool force = false); + void SetStartPreset(string name, bool force = false); + + /// true if changed, false otherwise + bool PauseStart(bool pause = true); + + /// true if paused, false otherwise + bool TogglePause(); + + bool DelayStart(TimeSpan time); } } diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index 0fa00cc772..e624970a94 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -29,5 +29,6 @@ + diff --git a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs index 294e796c87..2c7dd1d282 100644 --- a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs +++ b/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs @@ -35,6 +35,7 @@ namespace Content.Shared.GameObjects.Components.Inventory MASK, OUTERCLOTHING, INNERCLOTHING, + NECK, BACKPACK, BELT, GLOVES, @@ -69,17 +70,18 @@ namespace Content.Shared.GameObjects.Components.Inventory MASK = 1 << 4, OUTERCLOTHING = 1 << 5, INNERCLOTHING = 1 << 6, - BACK = 1 << 7, - BACKPACK = 1 << 7, - BELT = 1 << 8, - GLOVES = 1 << 9, - HAND = 1 << 9, - IDCARD = 1 << 10, - POCKET = 1 << 11, - LEGS = 1 << 12, - SHOES = 1 << 13, - FEET = 1 << 13, - EXOSUITSTORAGE = 1 << 14 + NECK = 1 << 7, + BACK = 1 << 8, + BACKPACK = 1 << 8, + BELT = 1 << 9, + GLOVES = 1 << 10, + HAND = 1 << 10, + IDCARD = 1 << 11, + POCKET = 1 << 12, + LEGS = 1 << 13, + SHOES = 1 << 14, + FEET = 1 << 14, + EXOSUITSTORAGE = 1 << 15 } public static readonly IReadOnlyDictionary SlotNames = new Dictionary() @@ -90,6 +92,7 @@ namespace Content.Shared.GameObjects.Components.Inventory {Slots.MASK, "Mask"}, {Slots.OUTERCLOTHING, "Outer Clothing"}, {Slots.INNERCLOTHING, "Inner Clothing"}, + {Slots.NECK, "Neck"}, {Slots.BACKPACK, "Backpack"}, {Slots.BELT, "Belt"}, {Slots.GLOVES, "Gloves"}, @@ -117,6 +120,7 @@ namespace Content.Shared.GameObjects.Components.Inventory {Slots.MASK, SlotFlags.MASK}, {Slots.OUTERCLOTHING, SlotFlags.OUTERCLOTHING}, {Slots.INNERCLOTHING, SlotFlags.INNERCLOTHING}, + {Slots.NECK, SlotFlags.NECK}, {Slots.BACKPACK, SlotFlags.BACK}, {Slots.BELT, SlotFlags.BELT}, {Slots.GLOVES, SlotFlags.GLOVES}, @@ -140,6 +144,7 @@ namespace Content.Shared.GameObjects.Components.Inventory "Inventory_MASK", "Inventory_OUTERCLOTHING", "Inventory_INNERCLOTHING", + "Inventory_NECK", "Inventory_BACKPACK", "Inventory_BELT", "Inventory_GLOVES", diff --git a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs b/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs index 32ef2ea30e..0415814b41 100644 --- a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs +++ b/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs @@ -28,11 +28,12 @@ namespace Content.Shared.GameObjects private static readonly Dictionary _slotDrawingOrder = new Dictionary { - {Slots.POCKET1, 12}, - {Slots.POCKET2, 11}, - {Slots.HEAD, 10}, - {Slots.MASK, 9}, - {Slots.EARS, 8}, + {Slots.POCKET1, 13}, + {Slots.POCKET2, 12}, + {Slots.HEAD, 11}, + {Slots.MASK, 10}, + {Slots.EARS, 9}, + {Slots.NECK, 8}, {Slots.BACKPACK, 7}, {Slots.EYES, 6}, {Slots.OUTERCLOTHING, 5}, @@ -46,9 +47,10 @@ namespace Content.Shared.GameObjects public override IReadOnlyList SlotMasks { get; } = new List() { Slots.EYES, Slots.HEAD, Slots.EARS, - Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING, + Slots.OUTERCLOTHING, Slots.MASK, Slots.INNERCLOTHING, Slots.BACKPACK, Slots.BELT, Slots.GLOVES, - Slots.NONE, Slots.SHOES, Slots.IDCARD, Slots.POCKET1, Slots.POCKET2 + Slots.NONE, Slots.SHOES, Slots.IDCARD, Slots.POCKET1, Slots.POCKET2, + Slots.NECK }; public override int SlotDrawingOrder(Slots slot) diff --git a/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs b/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs index d1f0918d7f..3074a970fd 100644 --- a/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs @@ -53,7 +53,7 @@ namespace Content.Shared.GameObjects.Components.Movement /// If the direction is active. void SetVelocityDirection(Direction direction, ushort subTick, bool enabled); - void SetSprinting(ushort subTick, bool enabled); + void SetSprinting(ushort subTick, bool walking); } } diff --git a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs index 01ff6e13c4..ee0b671c1a 100644 --- a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs +++ b/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs @@ -77,7 +77,7 @@ namespace Content.Shared.GameObjects.Components.Movement public float CurrentPushSpeed => 5; public float GrabRange => 0.2f; - public bool Sprinting => !_heldMoveButtons.HasFlag(MoveButtons.Sprint); + public bool Sprinting => !_heldMoveButtons.HasFlag(MoveButtons.Walk); /// /// Calculated linear velocity direction of the entity. @@ -207,11 +207,11 @@ namespace Content.Shared.GameObjects.Components.Movement Dirty(); } - public void SetSprinting(ushort subTick, bool enabled) + public void SetSprinting(ushort subTick, bool walking) { // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}"); - SetMoveInput(subTick, enabled, MoveButtons.Sprint); + SetMoveInput(subTick, walking, MoveButtons.Walk); } public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) @@ -281,7 +281,7 @@ namespace Content.Shared.GameObjects.Components.Movement Down = 2, Left = 4, Right = 8, - Sprint = 16, + Walk = 16, } } } diff --git a/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs b/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs index 18f7a9ff7e..b09d353b27 100644 --- a/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs +++ b/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs @@ -108,6 +108,9 @@ namespace Content.Shared.GameObjects.Components.Sound public void ExposeData(ObjectSerializer serializer) { + if (!serializer.Reading) + return; + Filename = serializer.ReadDataField("filename", ""); Delay = serializer.ReadDataField("delay", 0u); RandomDelay = serializer.ReadDataField("randomdelay", 0u); diff --git a/Content.Shared/GameObjects/Components/Utensil/SharedUtensilComponent.cs b/Content.Shared/GameObjects/Components/Utensil/SharedUtensilComponent.cs new file mode 100644 index 0000000000..faccf1287d --- /dev/null +++ b/Content.Shared/GameObjects/Components/Utensil/SharedUtensilComponent.cs @@ -0,0 +1,21 @@ +using System; +using Robust.Shared.GameObjects; + +namespace Content.Shared.GameObjects.Components.Utensil +{ + [Flags] + public enum UtensilType : byte + { + None = 0, + Fork = 1, + Spoon = 1 << 1, + Knife = 1 << 2 + } + + public class SharedUtensilComponent : Component + { + public override string Name => "Utensil"; + + public virtual UtensilType Types { get; set; } + } +} diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponentState.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponentState.cs deleted file mode 100644 index 158dbaa5ad..0000000000 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponentState.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using Robust.Shared.GameObjects; -using Robust.Shared.Serialization; - -namespace Content.Shared.GameObjects.Components.Weapons.Ranged -{ - [Serializable, NetSerializable] - public class BallisticMagazineWeaponComponentState : ComponentState - { - /// - /// True if a bullet is chambered. - /// - public bool Chambered { get; } - - /// - /// Count of bullets in the magazine. - /// - /// - /// Null if no magazine is inserted. - /// - public (int count, int max)? MagazineCount { get; } - - public BallisticMagazineWeaponComponentState(bool chambered, (int count, int max)? magazineCount) : base(ContentNetIDs.BALLISTIC_MAGAZINE_WEAPON) - { - Chambered = chambered; - MagazineCount = magazineCount; - } - } - - // BMW is "Ballistic Magazine Weapon" here. - /// - /// Fired server -> client when the magazine in a Ballistic Magazine Weapon got auto-ejected. - /// - [Serializable, NetSerializable] - public sealed class BmwComponentAutoEjectedMessage : ComponentMessage - { - - } -} diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedMagazineBarrelComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedMagazineBarrelComponent.cs new file mode 100644 index 0000000000..319327f5d5 --- /dev/null +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedMagazineBarrelComponent.cs @@ -0,0 +1,48 @@ +using System; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; + +namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels +{ + [Serializable, NetSerializable] + public enum AmmoVisuals + { + AmmoCount, + AmmoMax, + Spent, + } + + [Serializable, NetSerializable] + public enum MagazineBarrelVisuals + { + MagLoaded + } + + [Serializable, NetSerializable] + public enum BarrelBoltVisuals + { + BoltOpen, + } + + [Serializable, NetSerializable] + public class MagazineBarrelComponentState : ComponentState + { + public bool Chambered { get; } + public FireRateSelector FireRateSelector { get; } + public (int count, int max)? Magazine { get; } + public string SoundGunshot { get; } + + public MagazineBarrelComponentState( + bool chambered, + FireRateSelector fireRateSelector, + (int count, int max)? magazine, + string soundGunshot) : + base(ContentNetIDs.MAGAZINE_BARREL) + { + Chambered = chambered; + FireRateSelector = fireRateSelector; + Magazine = magazine; + SoundGunshot = soundGunshot; + } + } +} \ No newline at end of file diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/MagazineAutoEjectMessage.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/MagazineAutoEjectMessage.cs new file mode 100644 index 0000000000..fe8f2e183c --- /dev/null +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/MagazineAutoEjectMessage.cs @@ -0,0 +1,12 @@ +using System; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; + +namespace Content.Shared.GameObjects.Components.Weapons.Ranged +{ + /// + /// This is sent if the MagazineBarrel AutoEjects the magazine + /// + [Serializable, NetSerializable] + public sealed class MagazineAutoEjectMessage : ComponentMessage {} +} \ No newline at end of file diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineComponent.cs deleted file mode 100644 index 6d7bb888e1..0000000000 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineComponent.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using Robust.Shared.Serialization; - -namespace Content.Shared.GameObjects.Components.Weapons.Ranged -{ - [Serializable, NetSerializable] - public enum BallisticMagazineVisuals - { - AmmoCapacity, - AmmoLeft, - } -} diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineWeaponComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineWeaponComponent.cs deleted file mode 100644 index 09b4c0b23d..0000000000 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedBallisticMagazineWeaponComponent.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using Robust.Shared.Serialization; - -namespace Content.Shared.GameObjects.Components.Weapons.Ranged -{ - [Serializable, NetSerializable] - public enum BallisticMagazineWeaponVisuals - { - MagazineLoaded, - AmmoCapacity, - AmmoLeft, - } -} diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs new file mode 100644 index 0000000000..bbda3adeb6 --- /dev/null +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs @@ -0,0 +1,23 @@ +using System; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; + +namespace Content.Shared.GameObjects.Components.Weapons.Ranged +{ + public abstract class SharedRangedBarrelComponent : Component + { + public abstract FireRateSelector FireRateSelector { get; } + public abstract FireRateSelector AllRateSelectors { get; } + public abstract float FireRate { get; } + public abstract int ShotsLeft { get; } + public abstract int Capacity { get; } + } + + [Flags] + public enum FireRateSelector + { + Safety = 0, + Single = 1 << 0, + Automatic = 1 << 1, + } +} \ No newline at end of file diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs index 50df283ab3..0eb6a6e49b 100644 --- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs +++ b/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs @@ -5,40 +5,35 @@ using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Weapons.Ranged { - public class SharedRangedWeaponComponent : Component + public abstract class SharedRangedWeaponComponent : Component { - private float _fireRate; - private bool _automatic; + // Each RangedWeapon should have a RangedWeapon component + + // some kind of RangedBarrelComponent (this dictates what ammo is retrieved). public override string Name => "RangedWeapon"; public override uint? NetID => ContentNetIDs.RANGED_WEAPON; + } - /// - /// If true, this weapon is fully automatic, holding down left mouse button will keep firing it. - /// - public bool Automatic => _automatic; - - /// - /// If the weapon is automatic, controls how many shots can be fired per second. - /// - public float FireRate => _fireRate; - - public override void ExposeData(ObjectSerializer serializer) + [Serializable, NetSerializable] + public sealed class RangedWeaponComponentState : ComponentState + { + public FireRateSelector FireRateSelector { get; } + + public RangedWeaponComponentState( + FireRateSelector fireRateSelector + ) : base(ContentNetIDs.RANGED_WEAPON) { - base.ExposeData(serializer); - - serializer.DataField(ref _fireRate, "firerate", 4); - serializer.DataField(ref _automatic, "automatic", false); + FireRateSelector = fireRateSelector; } + } - [Serializable, NetSerializable] - protected class SyncFirePosMessage : ComponentMessage + [Serializable, NetSerializable] + public sealed class FirePosComponentMessage : ComponentMessage + { + public GridCoordinates Target { get; } + + public FirePosComponentMessage(GridCoordinates target) { - public readonly GridCoordinates Target; - - public SyncFirePosMessage(GridCoordinates target) - { - Target = target; - } + Target = target; } } } diff --git a/Content.Shared/GameObjects/Components/Weapons/SharedFlashableComponent.cs b/Content.Shared/GameObjects/Components/Weapons/SharedFlashableComponent.cs new file mode 100644 index 0000000000..6143825eb4 --- /dev/null +++ b/Content.Shared/GameObjects/Components/Weapons/SharedFlashableComponent.cs @@ -0,0 +1,25 @@ +using System; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization; + +namespace Content.Shared.GameObjects.Components.Weapons +{ + public class SharedFlashableComponent : Component + { + public override string Name => "Flashable"; + public override uint? NetID => ContentNetIDs.FLASHABLE; + } + + [Serializable, NetSerializable] + public class FlashComponentState : ComponentState + { + public double Duration { get; } + public TimeSpan Time { get; } + + public FlashComponentState(double duration, TimeSpan time) : base(ContentNetIDs.FLASHABLE) + { + Duration = duration; + Time = time; + } + } +} diff --git a/Content.Shared/GameObjects/ContentNetIDs.cs b/Content.Shared/GameObjects/ContentNetIDs.cs index 8b574d2db6..2fc90dbae7 100644 --- a/Content.Shared/GameObjects/ContentNetIDs.cs +++ b/Content.Shared/GameObjects/ContentNetIDs.cs @@ -5,7 +5,7 @@ { public const uint DAMAGEABLE = 1000; public const uint DESTRUCTIBLE = 1001; - public const uint BALLISTIC_MAGAZINE_WEAPON = 1002; + public const uint MAGAZINE_BARREL = 1002; public const uint HANDS = 1003; public const uint SOLUTION = 1004; public const uint STORAGE = 1005; @@ -55,6 +55,8 @@ public const uint HUNGER = 1049; public const uint THIRST = 1050; + public const uint FLASHABLE = 1051; + // Net IDs for integration tests. public const uint PREDICTION_TEST = 10001; } diff --git a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs index b9d2a90898..ade5c386ab 100644 --- a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs +++ b/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs @@ -50,7 +50,7 @@ namespace Content.Shared.GameObjects.EntitySystems .Bind(EngineKeyFunctions.MoveLeft, moveLeftCmdHandler) .Bind(EngineKeyFunctions.MoveRight, moveRightCmdHandler) .Bind(EngineKeyFunctions.MoveDown, moveDownCmdHandler) - .Bind(EngineKeyFunctions.Run, new SprintInputCmdHandler()) + .Bind(EngineKeyFunctions.Walk, new WalkInputCmdHandler()) .Register(); _configurationManager.RegisterCVar("game.diagonalmovement", true, CVar.ARCHIVE); @@ -170,14 +170,14 @@ namespace Content.Shared.GameObjects.EntitySystems moverComp.SetVelocityDirection(dir, subTick, state); } - private static void HandleRunChange(ICommonSession? session, ushort subTick, bool running) + private static void HandleRunChange(ICommonSession? session, ushort subTick, bool walking) { if (!TryGetAttachedComponent(session, out var moverComp)) { return; } - moverComp.SetSprinting(subTick, running); + moverComp.SetSprinting(subTick, walking); } private static bool TryGetAttachedComponent(ICommonSession? session, [MaybeNullWhen(false)] out T component) @@ -218,7 +218,7 @@ namespace Content.Shared.GameObjects.EntitySystems } } - private sealed class SprintInputCmdHandler : InputCmdHandler + private sealed class WalkInputCmdHandler : InputCmdHandler { public override bool HandleCmdMessage(ICommonSession? session, InputCmdMessage message) { diff --git a/Content.Shared/Jobs/StartingGearPrototype.cs b/Content.Shared/Jobs/StartingGearPrototype.cs index 5fc9b9a877..154e0dbe3e 100644 --- a/Content.Shared/Jobs/StartingGearPrototype.cs +++ b/Content.Shared/Jobs/StartingGearPrototype.cs @@ -15,6 +15,12 @@ namespace Content.Shared.Jobs private string _id; private Dictionary _equipment; + public IReadOnlyDictionary Inhand => _inHand; + /// + /// hand index, item prototype + /// + private Dictionary _inHand; + [ViewVariables] public string ID => _id; [ViewVariables] public IReadOnlyDictionary Equipment => _equipment; @@ -24,6 +30,7 @@ namespace Content.Shared.Jobs var serializer = YamlObjectSerializer.NewReader(mapping); serializer.DataField(ref _id, "id", string.Empty); + serializer.DataField(ref _inHand, "inhand", new Dictionary(0)); var equipment = serializer.ReadDataField>("equipment"); diff --git a/Content.Shared/SharedGameTicker.cs b/Content.Shared/SharedGameTicker.cs index 0aa4ea4b4c..2fea6dd16b 100644 --- a/Content.Shared/SharedGameTicker.cs +++ b/Content.Shared/SharedGameTicker.cs @@ -66,6 +66,7 @@ namespace Content.Shared public bool YouAreReady { get; set; } // UTC. public DateTime StartTime { get; set; } + public bool Paused { get; set; } public override void ReadFromBuffer(NetIncomingMessage buffer) { @@ -78,6 +79,7 @@ namespace Content.Shared YouAreReady = buffer.ReadBoolean(); StartTime = new DateTime(buffer.ReadInt64(), DateTimeKind.Utc); + Paused = buffer.ReadBoolean(); } public override void WriteToBuffer(NetOutgoingMessage buffer) @@ -91,6 +93,7 @@ namespace Content.Shared buffer.Write(YouAreReady); buffer.Write(StartTime.Ticks); + buffer.Write(Paused); } } @@ -116,6 +119,40 @@ namespace Content.Shared buffer.Write(TextBlob); } } + + protected class MsgTickerLobbyCountdown : NetMessage + { + #region REQUIRED + + public const MsgGroups GROUP = MsgGroups.Command; + public const string NAME = nameof(MsgTickerLobbyCountdown); + public MsgTickerLobbyCountdown(INetChannel channel) : base(NAME, GROUP) { } + + #endregion + + /// + /// The total amount of seconds to go until the countdown finishes + /// + public DateTime StartTime { get; set; } + + /// + /// Whether or not the countdown is paused + /// + public bool Paused { get; set; } + + public override void ReadFromBuffer(NetIncomingMessage buffer) + { + StartTime = new DateTime(buffer.ReadInt64(), DateTimeKind.Utc); + Paused = buffer.ReadBoolean(); + } + + public override void WriteToBuffer(NetOutgoingMessage buffer) + { + buffer.Write(StartTime.Ticks); + buffer.Write(Paused); + } + } + public struct RoundEndPlayerInfo { public string PlayerOOCName; diff --git a/Content.Shared/Utility/ContentHelpers.cs b/Content.Shared/Utility/ContentHelpers.cs index 2eab08cff4..58cc6a7110 100644 --- a/Content.Shared/Utility/ContentHelpers.cs +++ b/Content.Shared/Utility/ContentHelpers.cs @@ -47,7 +47,7 @@ namespace Content.Shared.Utility } var preround = toOne * (levels - 1); - if (toOne <= threshold || levels == 2) + if (toOne <= threshold || levels <= 2) { return (int)Math.Ceiling(preround); } diff --git a/Resources/Audio/Guns/Bolt/lmg_bolt_closed.ogg b/Resources/Audio/Guns/Bolt/lmg_bolt_closed.ogg new file mode 100644 index 0000000000..a93d39809e Binary files /dev/null and b/Resources/Audio/Guns/Bolt/lmg_bolt_closed.ogg differ diff --git a/Resources/Audio/Guns/Bolt/lmg_bolt_open.ogg b/Resources/Audio/Guns/Bolt/lmg_bolt_open.ogg new file mode 100644 index 0000000000..1a54501d7d Binary files /dev/null and b/Resources/Audio/Guns/Bolt/lmg_bolt_open.ogg differ diff --git a/Resources/Audio/Guns/Bolt/rifle_bolt_closed.ogg b/Resources/Audio/Guns/Bolt/rifle_bolt_closed.ogg new file mode 100644 index 0000000000..5bb57f7943 Binary files /dev/null and b/Resources/Audio/Guns/Bolt/rifle_bolt_closed.ogg differ diff --git a/Resources/Audio/Guns/Bolt/rifle_bolt_open.ogg b/Resources/Audio/Guns/Bolt/rifle_bolt_open.ogg new file mode 100644 index 0000000000..d7b1f368db Binary files /dev/null and b/Resources/Audio/Guns/Bolt/rifle_bolt_open.ogg differ diff --git a/Resources/Audio/Guns/Casings/casingfall1.ogg b/Resources/Audio/Guns/Casings/casing_fall_1.ogg similarity index 100% rename from Resources/Audio/Guns/Casings/casingfall1.ogg rename to Resources/Audio/Guns/Casings/casing_fall_1.ogg diff --git a/Resources/Audio/Guns/Casings/casingfall2.ogg b/Resources/Audio/Guns/Casings/casing_fall_2.ogg similarity index 100% rename from Resources/Audio/Guns/Casings/casingfall2.ogg rename to Resources/Audio/Guns/Casings/casing_fall_2.ogg diff --git a/Resources/Audio/Guns/Casings/casingfall3.ogg b/Resources/Audio/Guns/Casings/casing_fall_3.ogg similarity index 100% rename from Resources/Audio/Guns/Casings/casingfall3.ogg rename to Resources/Audio/Guns/Casings/casing_fall_3.ogg diff --git a/Resources/Audio/Guns/Casings/shotgun_fall.ogg b/Resources/Audio/Guns/Casings/shotgun_fall.ogg new file mode 100644 index 0000000000..6a89109a12 Binary files /dev/null and b/Resources/Audio/Guns/Casings/shotgun_fall.ogg differ diff --git a/Resources/Audio/Guns/Cock/hpistol_cock.ogg b/Resources/Audio/Guns/Cock/hpistol_cock.ogg new file mode 100644 index 0000000000..7b70346dd5 Binary files /dev/null and b/Resources/Audio/Guns/Cock/hpistol_cock.ogg differ diff --git a/Resources/Audio/Guns/Cock/m41_cock.ogg b/Resources/Audio/Guns/Cock/m41_cock.ogg new file mode 100644 index 0000000000..3d914184f0 Binary files /dev/null and b/Resources/Audio/Guns/Cock/m41_cock.ogg differ diff --git a/Resources/Audio/Guns/Cock/pistol_cock.ogg b/Resources/Audio/Guns/Cock/pistol_cock.ogg new file mode 100644 index 0000000000..ff2512af27 Binary files /dev/null and b/Resources/Audio/Guns/Cock/pistol_cock.ogg differ diff --git a/Resources/Audio/Guns/Cock/revolver_cock.ogg b/Resources/Audio/Guns/Cock/revolver_cock.ogg new file mode 100644 index 0000000000..d1c4a189f1 Binary files /dev/null and b/Resources/Audio/Guns/Cock/revolver_cock.ogg differ diff --git a/Resources/Audio/Guns/Cock/sfrifle_cock.ogg b/Resources/Audio/Guns/Cock/sf_rifle_cock.ogg similarity index 100% rename from Resources/Audio/Guns/Cock/sfrifle_cock.ogg rename to Resources/Audio/Guns/Cock/sf_rifle_cock.ogg diff --git a/Resources/Audio/Guns/Cock/shotgun_close.ogg b/Resources/Audio/Guns/Cock/shotgun_close.ogg new file mode 100644 index 0000000000..8ded3a7235 Binary files /dev/null and b/Resources/Audio/Guns/Cock/shotgun_close.ogg differ diff --git a/Resources/Audio/Guns/Cock/shotgun_open.ogg b/Resources/Audio/Guns/Cock/shotgun_open.ogg new file mode 100644 index 0000000000..2685be58a3 Binary files /dev/null and b/Resources/Audio/Guns/Cock/shotgun_open.ogg differ diff --git a/Resources/Audio/Guns/Cock/smg_cock.ogg b/Resources/Audio/Guns/Cock/smg_cock.ogg new file mode 100644 index 0000000000..3f9fc0e76e Binary files /dev/null and b/Resources/Audio/Guns/Cock/smg_cock.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/bang.ogg b/Resources/Audio/Guns/Gunshots/bang.ogg new file mode 100644 index 0000000000..df7ddc5943 Binary files /dev/null and b/Resources/Audio/Guns/Gunshots/bang.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/grenade_launcher.ogg b/Resources/Audio/Guns/Gunshots/grenade_launcher.ogg new file mode 100644 index 0000000000..a9c2029382 Binary files /dev/null and b/Resources/Audio/Guns/Gunshots/grenade_launcher.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/laser3.ogg b/Resources/Audio/Guns/Gunshots/laser3.ogg new file mode 100644 index 0000000000..41548f1885 Binary files /dev/null and b/Resources/Audio/Guns/Gunshots/laser3.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/laser_cannon2.ogg b/Resources/Audio/Guns/Gunshots/laser_cannon2.ogg index 3ebbe65543..c98db3b57f 100644 Binary files a/Resources/Audio/Guns/Gunshots/laser_cannon2.ogg and b/Resources/Audio/Guns/Gunshots/laser_cannon2.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/m41.ogg b/Resources/Audio/Guns/Gunshots/m41.ogg new file mode 100644 index 0000000000..4d7450a17b Binary files /dev/null and b/Resources/Audio/Guns/Gunshots/m41.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/rpgfire.ogg b/Resources/Audio/Guns/Gunshots/rpgfire.ogg new file mode 100644 index 0000000000..516618fe91 Binary files /dev/null and b/Resources/Audio/Guns/Gunshots/rpgfire.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/shotgun.ogg b/Resources/Audio/Guns/Gunshots/shotgun.ogg index 2f499f08b0..94f98d0f9e 100644 Binary files a/Resources/Audio/Guns/Gunshots/shotgun.ogg and b/Resources/Audio/Guns/Gunshots/shotgun.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/sniper.ogg b/Resources/Audio/Guns/Gunshots/sniper.ogg index 4c280c224a..625413ba76 100644 Binary files a/Resources/Audio/Guns/Gunshots/sniper.ogg and b/Resources/Audio/Guns/Gunshots/sniper.ogg differ diff --git a/Resources/Audio/Guns/Gunshots/taser.ogg b/Resources/Audio/Guns/Gunshots/taser.ogg new file mode 100644 index 0000000000..5aff5fc259 Binary files /dev/null and b/Resources/Audio/Guns/Gunshots/taser.ogg differ diff --git a/Resources/Audio/Guns/Hits/bullet_hit.ogg b/Resources/Audio/Guns/Hits/bullet_hit.ogg new file mode 100644 index 0000000000..68980b8712 Binary files /dev/null and b/Resources/Audio/Guns/Hits/bullet_hit.ogg differ diff --git a/Resources/Audio/Guns/Hits/laser_sear_wall.ogg b/Resources/Audio/Guns/Hits/laser_sear_wall.ogg new file mode 100644 index 0000000000..e546a6921f Binary files /dev/null and b/Resources/Audio/Guns/Hits/laser_sear_wall.ogg differ diff --git a/Resources/Audio/Guns/Hits/snap.ogg b/Resources/Audio/Guns/Hits/snap.ogg new file mode 100644 index 0000000000..d8804bc6e9 Binary files /dev/null and b/Resources/Audio/Guns/Hits/snap.ogg differ diff --git a/Resources/Audio/Guns/Hits/taser_hit.ogg b/Resources/Audio/Guns/Hits/taser_hit.ogg new file mode 100644 index 0000000000..b353513d34 Binary files /dev/null and b/Resources/Audio/Guns/Hits/taser_hit.ogg differ diff --git a/Resources/Audio/Guns/MagIn/bullet_insert.ogg b/Resources/Audio/Guns/MagIn/bullet_insert.ogg new file mode 100644 index 0000000000..d68b0a61a0 Binary files /dev/null and b/Resources/Audio/Guns/MagIn/bullet_insert.ogg differ diff --git a/Resources/Audio/Guns/MagIn/bullet_insert2.ogg b/Resources/Audio/Guns/MagIn/bullet_insert2.ogg new file mode 100644 index 0000000000..6417764475 Binary files /dev/null and b/Resources/Audio/Guns/MagIn/bullet_insert2.ogg differ diff --git a/Resources/Audio/Guns/MagOut/shotgun_insert.ogg b/Resources/Audio/Guns/MagIn/shotgun_insert.ogg similarity index 100% rename from Resources/Audio/Guns/MagOut/shotgun_insert.ogg rename to Resources/Audio/Guns/MagIn/shotgun_insert.ogg diff --git a/Resources/Audio/Guns/Misc/revolver_spin.ogg b/Resources/Audio/Guns/Misc/revolver_spin.ogg new file mode 100644 index 0000000000..e400a18bce Binary files /dev/null and b/Resources/Audio/Guns/Misc/revolver_spin.ogg differ diff --git a/Resources/Audio/effects/flash_bang.ogg b/Resources/Audio/effects/flash_bang.ogg new file mode 100644 index 0000000000..68829e2f85 Binary files /dev/null and b/Resources/Audio/effects/flash_bang.ogg differ diff --git a/Resources/Audio/effects/gen_hit.ogg b/Resources/Audio/effects/gen_hit.ogg new file mode 100644 index 0000000000..9a354b9a00 Binary files /dev/null and b/Resources/Audio/effects/gen_hit.ogg differ diff --git a/Resources/Audio/items/snap.ogg b/Resources/Audio/items/snap.ogg new file mode 100644 index 0000000000..9763ea1ed2 Binary files /dev/null and b/Resources/Audio/items/snap.ogg differ diff --git a/Resources/Groups/groups.yml b/Resources/Groups/groups.yml index 9d11fce6d0..57728a024f 100644 --- a/Resources/Groups/groups.yml +++ b/Resources/Groups/groups.yml @@ -55,6 +55,8 @@ - tp - tpgrid - setgamepreset + - forcepreset + - delaystart - startround - endround - restartround @@ -98,6 +100,8 @@ - tp - tpgrid - setgamepreset + - forcepreset + - delaystart - startround - endround - restartround diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index 796972b455..c1c4201809 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -109,8 +109,6 @@ entities: pos: -1.47174,4.550247 rot: -1.5707963267949 rad type: Transform - - charge: 1200 - type: HitscanWeaponCapacitor - uid: 2 type: LaserGun components: @@ -118,8 +116,6 @@ entities: pos: -0.6748645,4.487747 rot: -1.5707963267949 rad type: Transform - - charge: 1200 - type: HitscanWeaponCapacitor - uid: 3 type: Brutepack components: @@ -2076,41 +2072,26 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 263 - type: magazine_10mm_smg + type: MagazinePistolSmg components: - parent: 0 pos: -6.605512,7.638151 rot: -1.5707963267949 rad type: Transform - - containers: - magazine_bullet_container: - entities: [] - type: Robust.Server.GameObjects.Components.Container.Container - type: ContainerContainer - uid: 264 - type: magazine_10mm_smg + type: MagazinePistolSmg components: - parent: 0 pos: -6.339887,7.669401 rot: -1.5707963267949 rad type: Transform - - containers: - magazine_bullet_container: - entities: [] - type: Robust.Server.GameObjects.Components.Container.Container - type: ContainerContainer - uid: 265 - type: magazine_10mm_smg + type: MagazinePistolSmg components: - parent: 0 pos: -6.027387,7.622526 rot: -1.5707963267949 rad type: Transform - - containers: - magazine_bullet_container: - entities: [] - type: Robust.Server.GameObjects.Components.Container.Container - type: ContainerContainer - uid: 266 type: BackpackClothing components: @@ -2149,14 +2130,6 @@ entities: pos: -2.524035,7.579326 rot: -1.5707963267949 rad type: Transform - - containers: - ballistics_chamber_0: - entities: [] - type: Content.Server.GameObjects.ContainerSlot - ballistic_gun_magazine: - entities: [] - type: Content.Server.GameObjects.ContainerSlot - type: ContainerContainer - uid: 270 type: SmgC20r components: @@ -2164,14 +2137,6 @@ entities: pos: -1.94591,7.485576 rot: -1.5707963267949 rad type: Transform - - containers: - ballistics_chamber_0: - entities: [] - type: Content.Server.GameObjects.ContainerSlot - ballistic_gun_magazine: - entities: [] - type: Content.Server.GameObjects.ContainerSlot - type: ContainerContainer - uid: 271 type: solid_wall components: diff --git a/Resources/Prototypes/Entities/Buildings/computers.yml b/Resources/Prototypes/Entities/Buildings/computers.yml index 4eb5de57f9..f50c04452a 100644 --- a/Resources/Prototypes/Entities/Buildings/computers.yml +++ b/Resources/Prototypes/Entities/Buildings/computers.yml @@ -18,6 +18,10 @@ - MobImpassable - VaultImpassable - Opaque + mask: + - Impassable + - MobImpassable + - VaultImpassable - type: Icon sprite: Buildings/computer.rsi state: computer diff --git a/Resources/Prototypes/Entities/Buildings/instruments.yml b/Resources/Prototypes/Entities/Buildings/instruments.yml index b020d4cfc3..05deaefd08 100644 --- a/Resources/Prototypes/Entities/Buildings/instruments.yml +++ b/Resources/Prototypes/Entities/Buildings/instruments.yml @@ -41,6 +41,13 @@ sprite: Objects/Instruments/otherinstruments.rsi state: piano - type: Anchorable + - type: Collidable + shapes: + - !type:PhysShapeAabb + mask: + - Impassable + - MobImpassable + - VaultImpassable - type: entity name: minimoog diff --git a/Resources/Prototypes/Entities/Buildings/vending_machines.yml b/Resources/Prototypes/Entities/Buildings/vending_machines.yml index 0b7bed5def..81a98d8023 100644 --- a/Resources/Prototypes/Entities/Buildings/vending_machines.yml +++ b/Resources/Prototypes/Entities/Buildings/vending_machines.yml @@ -20,6 +20,11 @@ shapes: - !type:PhysShapeAabb bounds: "-0.5,-0.25,0.5,0.25" + mask: + - Impassable + - MobImpassable + - VaultImpassable + - SmallImpassable layer: - Opaque - Impassable diff --git a/Resources/Prototypes/Entities/Fluids/puddle.yml b/Resources/Prototypes/Entities/Fluids/puddle.yml index 3f9717ec95..15b0ab864c 100644 --- a/Resources/Prototypes/Entities/Fluids/puddle.yml +++ b/Resources/Prototypes/Entities/Fluids/puddle.yml @@ -36,7 +36,7 @@ sprite: Fluids/gibblet.rsi # Placeholder state: gibblet-0 - type: Icon - icon: Fluids/gibblet.rsi + sprite: Fluids/gibblet.rsi state: gibblet-0 - type: Puddle variants: 5 @@ -51,7 +51,7 @@ sprite: Fluids/smear.rsi # Placeholder state: smear-0 - type: Icon - icon: Fluids/smear.rsi + sprite: Fluids/smear.rsi state: smear-0 - type: Puddle variants: 7 @@ -66,7 +66,7 @@ sprite: Fluids/splatter.rsi # Placeholder state: splatter-0 - type: Icon - icon: Fluids/splatter.rsi + sprite: Fluids/splatter.rsi state: splatter-0 - type: Puddle variants: 6 @@ -81,7 +81,7 @@ sprite: Fluids/vomit.rsi state: vomit-0 - type: Icon - icon: Fluids/vomit.rsi + sprite: Fluids/vomit.rsi state: vomit-0 - type: Puddle variants: 4 @@ -97,7 +97,7 @@ sprite: Fluids/vomit_toxin.rsi state: vomit_toxin-0 - type: Icon - icon: Fluids/vomit_toxin.rsi + sprite: Fluids/vomit_toxin.rsi state: vomit_toxin-0 - type: Puddle variants: 4 @@ -113,7 +113,7 @@ sprite: Fluids/writing.rsi # Placeholder state: writing-0 - type: Icon - icon: Fluids/writing.rsi + sprite: Fluids/writing.rsi state: writing-0 - type: Puddle variants: 5 diff --git a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml index f445b49531..7dbc1a155a 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml @@ -635,19 +635,6 @@ - type: Clothing sprite: Clothing/OuterClothing/gentlecoat.rsi -- type: entity - parent: OuterclothingBase - id: OuterclothingGolem - name: golem - description: '' - components: - - type: Sprite - sprite: Clothing/OuterClothing/golem.rsi - - type: Icon - sprite: Clothing/OuterClothing/golem.rsi - - type: Clothing - sprite: Clothing/OuterClothing/golem.rsi - - type: entity parent: OuterclothingBase id: OuterclothingGreyhoodie diff --git a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml index 1a6237eefc..e018c59139 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml @@ -13,7 +13,7 @@ Size: 10 QuickEquip: true Slots: - - back + - neck sprite: Clothing/cloak.rsi - type: entity @@ -42,7 +42,6 @@ - type: Clothing HeldPrefix: hoscloak - - type: entity parent: CloakClothing id: CeCloak @@ -55,7 +54,6 @@ - type: Clothing HeldPrefix: cecloak - - type: entity parent: CloakClothing id: CmoCloak @@ -80,7 +78,6 @@ - type: Clothing HeldPrefix: rdcloak - - type: entity parent: CloakClothing id: QmCloak @@ -104,3 +101,15 @@ state: hopcloak - type: Clothing HeldPrefix: hopcloak + +- type: entity + parent: CloakClothing + id: HeraldCloak + name: Herald's cloak + components: + - type: Sprite + state: heraldcloak + - type: Icon + state: heraldcloak + - type: Clothing + HeldPrefix: heraldcloak diff --git a/Resources/Prototypes/Entities/Items/Clothing/neck.yml b/Resources/Prototypes/Entities/Items/Clothing/neck.yml new file mode 100644 index 0000000000..658756bfb9 --- /dev/null +++ b/Resources/Prototypes/Entities/Items/Clothing/neck.yml @@ -0,0 +1,134 @@ +- type: entity + parent: Clothing + id: NeckClothing + abstract: true + name: neck + description: + components: + - type: Sprite + sprite: Clothing/neck.rsi + - type: Icon + sprite: Clothing/neck.rsi + - type: Clothing + Size: 10 + QuickEquip: true + Slots: + - neck + sprite: Clothing/neck.rsi + +- type: entity + parent: NeckClothing + id: HeadPhonesOn + name: headphones + description: + components: + - type: Sprite + state: headphones_on + - type: Icon + state: headphones_on + - type: Clothing + HeldPrefix: headphones_on + +- type: entity + parent: NeckClothing + id: RedTie + name: red-tie + description: + components: + - type: Sprite + state: redtie + - type: Icon + state: redtie + - type: Clothing + HeldPrefix: redtie + +- type: entity + parent: NeckClothing + id: DetTie + name: detective's tie + description: + components: + - type: Sprite + state: dettie + - type: Icon + state: dettie + - type: Clothing + HeldPrefix: dettie + +- type: entity + parent: NeckClothing + id: Stethoscope + name: stethoscope + description: + components: + - type: Sprite + state: stethoscope + - type: Icon + state: stethoscope + - type: Clothing + HeldPrefix: stethoscope + +- type: entity + parent: NeckClothing + id: StripedRedScarf + name: striped red scarf + description: + components: + - type: Sprite + state: stripedredscarf + - type: Icon + state: stripedredscarf + - type: Clothing + HeldPrefix: stripedredscarf + +- type: entity + parent: NeckClothing + id: StripedBlueScarf + name: striped blue scarf + description: + components: + - type: Sprite + state: stripedbluescarf + - type: Icon + state: stripedbluescarf + - type: Clothing + HeldPrefix: stripedbluescarf + +- type: entity + parent: NeckClothing + id: StripedGreenScarf + name: striped green scarf + description: + components: + - type: Sprite + state: stripedgreenscarf + - type: Icon + state: stripedgreenscarf + - type: Clothing + HeldPrefix: stripedgreenscarf + +- type: entity + parent: NeckClothing + id: ZebraScarf + name: zebra scarf + description: + components: + - type: Sprite + state: zebrascarf + - type: Icon + state: zebrascarf + - type: Clothing + HeldPrefix: zebrascarf + +- type: entity + parent: NeckClothing + id: Bling + name: bling + description: + components: + - type: Sprite + state: bling + - type: Icon + state: bling + - type: Clothing + HeldPrefix: bling diff --git a/Resources/Prototypes/Entities/Items/Consumables/food.yml b/Resources/Prototypes/Entities/Items/Consumables/food.yml index 612056a604..a76f1400ce 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/food.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml @@ -3,6 +3,7 @@ id: FoodBase abstract: true components: + - type: Food - type: LoopingSound - type: Sprite state: icon @@ -2988,3 +2989,22 @@ sprite: Objects/Food/stew.rsi - type: Icon sprite: Objects/Food/stew.rsi + +- type: entity + parent: FoodBase + id: MilkApe + name: Milk Ape +# Milk Ape's a proper noun you fuck + description: He sighed for your grins. + components: + - type: Food + trash: TrashSnackBowl + - type: Solution + contents: + reagents: + - ReagentId: chem.Nutriment + Quantity: 20 + - type: Sprite + sprite: Objects/Food/milkape.rsi + - type: Icon + sprite: Objects/Food/milkape.rsi diff --git a/Resources/Prototypes/Entities/Items/bedsheets.yml b/Resources/Prototypes/Entities/Items/bedsheets.yml index 229a8cd72a..a437f8bc6e 100644 --- a/Resources/Prototypes/Entities/Items/bedsheets.yml +++ b/Resources/Prototypes/Entities/Items/bedsheets.yml @@ -28,8 +28,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetblack - type: entity @@ -45,8 +45,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetblue - type: entity @@ -62,8 +62,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetbrown - type: entity @@ -79,8 +79,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcaptain - type: entity @@ -96,8 +96,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetce - type: entity @@ -113,8 +113,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcentcom - type: entity @@ -130,9 +130,9 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi - HeldPrefix: sheetclown + - neck + sprite: Clothing/neck.rsi + HeldPrefix: sheetrainbow - type: entity id: BedsheetCMO @@ -147,8 +147,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcmo - type: entity @@ -164,8 +164,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcosmos - type: entity @@ -181,8 +181,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetcult - type: entity @@ -198,8 +198,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetgreen - type: entity @@ -215,8 +215,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetgrey - type: entity @@ -232,8 +232,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheethop - type: entity @@ -249,8 +249,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheethos - type: entity @@ -266,8 +266,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetian - type: entity @@ -283,8 +283,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetmedical - type: entity @@ -300,8 +300,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetmime - type: entity @@ -317,8 +317,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetNT - type: entity @@ -334,8 +334,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetorange - type: entity @@ -351,8 +351,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetpurple - type: entity @@ -368,8 +368,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetqm - type: entity @@ -385,8 +385,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetrainbow - type: entity @@ -402,8 +402,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetrd - type: entity @@ -419,8 +419,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetred - type: entity @@ -436,8 +436,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetsyndie - type: entity @@ -453,8 +453,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetUSA - type: entity @@ -470,8 +470,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetwhite - type: entity @@ -487,8 +487,8 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetwiz - type: entity @@ -504,6 +504,6 @@ Size: 10 QuickEquip: true Slots: - - back - sprite: Clothing/back.rsi + - neck + sprite: Clothing/neck.rsi HeldPrefix: sheetyellow diff --git a/Resources/Prototypes/Entities/Items/utensils.yml b/Resources/Prototypes/Entities/Items/utensils.yml index 577440d813..245b1b6642 100644 --- a/Resources/Prototypes/Entities/Items/utensils.yml +++ b/Resources/Prototypes/Entities/Items/utensils.yml @@ -5,7 +5,6 @@ components: - type: Sprite sprite: Objects/utensils.rsi - - type: Icon sprite: Objects/utensils.rsi @@ -17,9 +16,11 @@ components: - type: Sprite state: fork - - type: Icon state: fork + - type: Utensil + types: + - Fork - type: entity parent: UtensilBase @@ -28,9 +29,12 @@ components: - type: Sprite state: plastic_fork - - type: Icon state: plastic_fork + - type: Utensil + types: + - Fork + breakChance: 0.20 - type: entity parent: UtensilBase @@ -40,9 +44,11 @@ components: - type: Sprite state: spoon - - type: Icon state: spoon + - type: Utensil + types: + - Spoon - type: entity parent: UtensilBase @@ -52,9 +58,12 @@ components: - type: Sprite state: plastic_spoon - - type: Icon state: plastic_spoon + - type: Utensil + types: + - Spoon + breakChance: 0.20 - type: entity parent: UtensilBase @@ -63,6 +72,9 @@ components: - type: Sprite state: plastic_knife - - type: Icon state: plastic_knife + - type: Utensil + types: + - Knife + breakChance: 0.20 diff --git a/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml b/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml index 9b5f6757b8..3339833383 100644 --- a/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml +++ b/Resources/Prototypes/Entities/Markers/gamemode_conditional_spawners.yml @@ -38,10 +38,9 @@ - RifleBlackAk - RifleCarbine - RifleDallas - - RifleIhHeavy - - RifleSolEot - - RifleSolPara - - RifleSts + - RifleSTS + - RifleVintorez + - RifleWintermute chance: 0.75 gameRules: - RuleSuspicion @@ -62,14 +61,16 @@ - type: ConditionalSpawner prototypes: - PistolClarissa - - PistolDeagle - - PistolDeckard + - PistolColt - PistolGiskard - - PistolGyro + - PistolHMPistol - PistolLamia - - PistolMakarov + - PistolMandella - PistolMk58 - - PistolOlivawCivil + - PistolMk58Wood + - PistolMolly + - PistolOlivaw + - PistolPaco chance: 0.75 gameRules: - RuleSuspicion @@ -94,6 +95,171 @@ - Spear - ToolboxEmergency - CrowbarRed + - Stunbaton + chance: 0.75 + gameRules: + - RuleSuspicion + +- type: entity + name: Suspicion Revolver Spawner + id: SuspicionRevolverSpawner + parent: BaseConditionalSpawner + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: spawner_revolver + - type: Icon + sprite: Objects/markers.rsi + state: spawner_revolver + - type: ConditionalSpawner + prototypes: + - RevolverDeckard + - RevolverInspector + - RevolverMateba + chance: 0.75 + gameRules: + - RuleSuspicion + +- type: entity + name: Suspicion Shotgun Spawner + id: SuspicionShotgunSpawner + parent: BaseConditionalSpawner + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: spawner_shotgun + - type: Icon + sprite: Objects/markers.rsi + state: spawner_shotgun + - type: ConditionalSpawner + prototypes: + - ShotgunBojevic + - ShotgunDB + - ShotgunBull + - ShotgunGladstone + - ShotgunRegulator + - ShotgunPump + - ShotgunSawn + chance: 0.75 + gameRules: + - RuleSuspicion + +- type: entity + name: Suspicion SMG Spawner + id: SuspicionSMGSpawner + parent: BaseConditionalSpawner + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: spawner_smg + - type: Icon + sprite: Objects/markers.rsi + state: spawner_smg + - type: ConditionalSpawner + prototypes: + - SmgAtreides + - SmgC20r + - SmgDrozd + - SmgStraylight + - SmgWt550 + - SmgZoric + chance: 0.75 + gameRules: + - RuleSuspicion + +- type: entity + name: Suspicion Sniper Spawner + id: SuspicionSniperSpawner + parent: BaseConditionalSpawner + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: spawner_sniper + - type: Icon + sprite: Objects/markers.rsi + state: spawner_sniper + - type: ConditionalSpawner + prototypes: + - SniperBoltGun + - SniperBoltGunWood + - SniperHeavy + chance: 0.75 + gameRules: + - RuleSuspicion + +- type: entity + name: Suspicion Hitscan Spawner + id: SuspicionHitscanSpawner + parent: BaseConditionalSpawner + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: spawner_hitscan + - type: Icon + sprite: Objects/markers.rsi + state: spawner_hitscan + - type: ConditionalSpawner + prototypes: + - RedLaser + - RedHeavyLaser + - XrayLaser + - LaserGun + - LaserCannon + - XrayCannon + - TaserGun + chance: 0.75 + gameRules: + - RuleSuspicion + +- type: entity + name: Suspicion Launchers Spawner + id: SuspicionLaunchersSpawner + parent: BaseConditionalSpawner + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: spawner_launcher + - type: Icon + sprite: Objects/markers.rsi + state: spawner_launcher + - type: ConditionalSpawner + prototypes: + - LauncherChinaLake + - LauncherRocket + chance: 0.75 + gameRules: + - RuleSuspicion + +- type: entity + name: Suspicion Grenades Spawner + id: SuspicionGrenadesSpawner + parent: BaseConditionalSpawner + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: spawner_grenade + - type: Icon + sprite: Objects/markers.rsi + state: spawner_grenade + - type: ConditionalSpawner + prototypes: + - ExGrenade + - GrenadeFlashBang + - SyndieMiniBomb chance: 0.75 gameRules: - RuleSuspicion diff --git a/Resources/Prototypes/Entities/Markers/timed_spawners.yml b/Resources/Prototypes/Entities/Markers/timed_spawners.yml new file mode 100644 index 0000000000..4bc96baeed --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/timed_spawners.yml @@ -0,0 +1,42 @@ +- type: entity + name: base timed spawner + id: BaseTimedSpawner + abstract: true + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: cross_blue + - type: Icon + sprite: Objects/markers.rsi + state: cross_blue + - type: Marker + - type: Clickable + - type: InteractionOutline + - type: Collidable + - type: TimedSpawner + placement: + mode: AlignTileAny + +- type: entity + name: AI Timed Spawner + id: AITimedSpawner + parent: BaseTimedSpawner + components: + - type: Sprite + netsync: false + visible: false + sprite: Objects/markers.rsi + state: spawner_rifle + - type: Icon + sprite: Objects/markers.rsi + state: spawner_rifle + - type: TimedSpawner + prototypes: + - HumanMob_Spirate + - HumanMob_Civilian + chance: 0.75 + intervalSeconds: 60 + minimumEntitiesSpawned: 1 + maximumEntitiesSpawned: 5 diff --git a/Resources/Prototypes/Entities/Mobs/human.yml b/Resources/Prototypes/Entities/Mobs/human.yml index 903ca8f432..1527f3d9a9 100644 --- a/Resources/Prototypes/Entities/Mobs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/human.yml @@ -8,6 +8,7 @@ drawdepth: Mobs abstract: true components: + - type: Flashable - type: Hands hands: - left @@ -24,6 +25,9 @@ - type: Stomach max_volume: 250 digestionDelay: 20 + # StatusEffects + - type: Stunnable + # EndStatusEffects - type: Inventory - type: Clickable - type: InteractionOutline @@ -83,6 +87,7 @@ - map: ["enum.Slots.OUTERCLOTHING"] - map: ["enum.Slots.EYES"] - map: ["enum.Slots.BELT"] + - map: ["enum.Slots.NECK"] - map: ["enum.Slots.BACKPACK"] - map: ["enum.HumanoidVisualLayers.FacialHair"] state: shaved @@ -129,12 +134,15 @@ - type: HumanoidAppearance - type: Stunnable - type: AnimationPlayer + - type: UnarmedCombat + range: 0.8 + arcwidth: 30 + arc: fist - type: entity save: false name: Urist McHands parent: BaseHumanMob_Content - abstract: true id: HumanMob_Content description: A miserable pile of secrets drawdepth: Mobs @@ -156,6 +164,7 @@ save: false name: Urist McHands id: HumanMob_Dummy + abstract: true description: A dummy human meant to be used in character setup components: - type: Hands @@ -223,6 +232,7 @@ - map: ["enum.Slots.OUTERCLOTHING"] - map: ["enum.Slots.EYES"] - map: ["enum.Slots.BELT"] + - map: ["enum.Slots.NECK"] - map: ["enum.Slots.BACKPACK"] - map: ["enum.HumanoidVisualLayers.FacialHair"] state: shaved diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml deleted file mode 100644 index 82147cac7e..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml +++ /dev/null @@ -1,369 +0,0 @@ -# Empty mags -- type: entity - id: magazine_10mm_empty - name: "10mm magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A10mm - magazine: A10mm - capacity: 8 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_10mm - name: "10mm magazine" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm - caliber: A10mm - capacity: 8 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/10.rsi - state: 10-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/10.rsi - state: 10-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 10 - steps: 2 - -- type: entity - id: magazine_10mmf - name: "10mm magazine (flash)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_flash - caliber: A10mm - capacity: 8 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/10f.rsi - state: 10f-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/10f.rsi - state: 10f-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 10f - steps: 2 - -- type: entity - id: magazine_10mmhv - name: "10mm magazine (high velocity)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_hv - caliber: A10mm - capacity: 8 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi - state: 10hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi - state: 10hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 10hv - steps: 2 - -- type: entity - id: magazine_10mml - name: "10mm magazine (L)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_l - caliber: A10mm - capacity: 8 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/10l.rsi - state: 10l-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/10l.rsi - state: 10l-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 10l - steps: 2 - -- type: entity - id: magazine_10mmp - name: "10mm magazine (practice)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_p - caliber: A10mm - capacity: 8 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/10p.rsi - state: 10p-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/10p.rsi - state: 10p-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 10p - steps: 2 - -- type: entity - id: magazine_10mmr - name: "10mm magazine (rubber)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_r - caliber: A10mm - capacity: 8 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/10r.rsi - state: 10r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/10r.rsi - state: 10r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 10r - steps: 2 - -- type: entity - id: magazine_10mm_smg - name: "10mm SMG magazine" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm - caliber: A10mm - magazine: A10mmSMG - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi - state: 12mml-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi - state: 12mml-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 12mml - steps: 2 - -- type: entity - id: magazine_10mm_smgf - name: "10mm SMG magazine (flash)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_flash - caliber: A10mm - magazine: A10mmSMG - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi - state: 12mmf-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi - state: 12mmf-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 12mmf - steps: 2 - -- type: entity - id: magazine_10mm_smghv - name: "10mm SMG magazine (high velocity)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_hv - caliber: A10mm - magazine: A10mmSMG - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi - state: 12mmhv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi - state: 12mmhv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 12mmhv - steps: 2 - -- type: entity - id: magazine_10mm_smgl - name: "10mm SMG magazine (L)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_l - caliber: A10mm - magazine: A10mmSMG - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi - state: 12mml-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi - state: 12mml-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 12mml - steps: 2 - -- type: entity - id: magazine_10mm_smgp - name: "10mm SMG magazine (practice)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_p - caliber: A10mm - magazine: A10mmSMG - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi - state: 12mmp-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi - state: 12mmp-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 12mmp - steps: 2 - -- type: entity - id: magazine_10mm_smgr - name: "10mm SMG magazine (rubber)" - parent: magazine_10mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_10mm_r - caliber: A10mm - magazine: A10mmSMG - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi - state: 12mmr-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi - state: 12mmr-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 12mmr - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_10mm - name: "10mm casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A10mm - projectile: bullet_10mm - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_10mm_flash - name: "10mm casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A10mm - projectile: bullet_10mmf - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_10mm_hv - name: "10mm casing (high velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A10mm - projectile: bullet_10mmhv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_10mm_l - name: "10mm casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A10mm - projectile: bullet_10mml - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_10mm_p - name: "10mm casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A10mm - projectile: bullet_10mmp - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_10mm_r - name: "10mm casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A10mm - projectile: bullet_10mmr - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/boxes.yml deleted file mode 100644 index a06bb0c159..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/boxes.yml +++ /dev/null @@ -1,118 +0,0 @@ -# Empty boxes -- type: entity - id: box_10mm_empty - name: "10mm box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A10mm - capacity: 30 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_10mm - name: "10mm box" - parent: box_10mm_empty - components: - - type: AmmoBox - fill: ammo_casing_10mm - caliber: A10mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi - state: box10mm-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi - state: box10mm-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box10mm - steps: 2 - -- type: entity - id: box_10mmf - name: "10mm box (flash)" - parent: box_10mm_empty - components: - - type: AmmoBox - fill: ammo_casing_10mm_flash - caliber: A10mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi - state: box10mm-flash-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi - state: box10mm-flash-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box10mm-flash - steps: 2 - -- type: entity - id: box_10mmhv - name: "10mm box (high-velocity)" - parent: box_10mm_empty - components: - - type: AmmoBox - fill: ammo_casing_10mm_hv - caliber: A10mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi - state: box10mm-hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi - state: box10mm-hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box10mm-hv - steps: 2 - -- type: entity - id: box_10mmp - name: "10mm box (practice)" - parent: box_10mm_empty - components: - - type: AmmoBox - fill: ammo_casing_10mm_p - caliber: A10mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi - state: box10mm-practice-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi - state: box10mm-practice-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box10mm-practice - steps: 2 - -- type: entity - id: box_10mmr - name: "10mm box (rubber)" - parent: box_10mm_empty - components: - - type: AmmoBox - fill: ammo_casing_10mm_r - caliber: A10mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi - state: box10mm-rubber-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi - state: box10mm-rubber-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box10mm-rubber - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml deleted file mode 100644 index d227e364a1..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_10mm - name: 10mm bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 24 - -- type: entity - id: bullet_10mmf - name: 10mm bullet (flash) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 24 - -- type: entity - id: bullet_10mmhv - name: 10mm bullet (high-velocity) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 29 - -- type: entity - id: bullet_10mml - name: 10mm bullet (L) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 24 - -- type: entity - id: bullet_10mmp - name: 10mm bullet (practice) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_10mmr - name: 10mm bullet (rubber) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 4 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/ammunition.yml deleted file mode 100644 index e742469d7d..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/ammunition.yml +++ /dev/null @@ -1,54 +0,0 @@ -# Empty mags -- type: entity - id: magazine_12g_empty - name: "12g magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A12g - magazine: A12g - capacity: 8 - - type: Sprite - netsync: false - -#Magazines -- type: entity - id: magazine_12g_shotgun - name: "12g magazine" - parent: magazine_12g_empty - components: - - type: BallisticMagazine - fill: ammo_casing_12g - caliber: A12g - magazine: A12g - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi - state: 12mml-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi - state: 12mml-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 12mml - steps: 2 - -# Casings -- type: entity - id: ammo_casing_12g - name: "12g casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A12g - projectile: pellet_12g - projectilesfired : 6 - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/boxes.yml deleted file mode 100644 index f0f8f2856e..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/boxes.yml +++ /dev/null @@ -1,34 +0,0 @@ -# Empty boxes -- type: entity - id: box_12g_empty - name: "12g box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A12g - capacity: 30 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_12g - name: "12g box" - parent: box_12g_empty - components: - - type: AmmoBox - fill: ammo_casing_12g - caliber: A12g - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi - state: box10mm-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi - state: box10mm-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box10mm - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml deleted file mode 100644 index 4d7d83acbe..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - id: pellet_12g - name: 12g pellet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 10 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/ammunition.yml deleted file mode 100644 index aabdfe042b..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/ammunition.yml +++ /dev/null @@ -1,52 +0,0 @@ -# Empty mags -- type: entity - id: magazine_20mm_empty - name: "20mm magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A20mm - magazine: A20mm - capacity: 4 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_20mm - name: "20mm magazine" - parent: magazine_20mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_20mm - caliber: A20mm - capacity: 4 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/20mm/75.rsi - state: 75-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/20mm/75.rsi - state: 75-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 75 - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_20mm - name: "20mm casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A20mm - projectile: bullet_20mm - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml deleted file mode 100644 index 74d9cde237..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - id: bullet_20mm - name: 20mm bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 10 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/ammunition.yml deleted file mode 100644 index 83b9f29c4e..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/ammunition.yml +++ /dev/null @@ -1,52 +0,0 @@ -# Empty mags -- type: entity - id: magazine_24mm_empty - name: "24mm magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A24mm - magazine: A24mm - capacity: 99 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_24mm - name: "24mm magazine" - parent: magazine_24mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_24mm - caliber: A24mm - capacity: 99 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi - state: 10x24-4 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi - state: 10x24-4 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 10x24 - steps: 5 - -# Casings - magazines above here -- type: entity - id: ammo_casing_24mm - name: "24mm casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A24mm - projectile: bullet_24mm - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/boxes.yml deleted file mode 100644 index 9bd7a1a48e..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/boxes.yml +++ /dev/null @@ -1,34 +0,0 @@ -# Empty boxes -- type: entity - id: box_24mm_empty - name: "7.62mm box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A24mm - capacity: 200 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_24mm - name: "24mm box" - parent: box_24mm_empty - components: - - type: AmmoBox - fill: ammo_casing_24mm - caliber: A24mm - capacity: 200 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi - state: box10x24-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi - state: box10x24-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box10x24 - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml deleted file mode 100644 index 5768c54888..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_24mm - name: 24mm bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 10 - -- type: entity - id: bullet_24mmf - name: 24mm bullet (flash) - parent: BulletBaseFlash - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 10 - -- type: entity - id: bullet_24mmhv - name: 24mm bullet (high-velocity) - parent: BulletBaseHighVelocity - abstract: true - components: - - type: Projectile - velocity: 27 - damages: - Brute: 15 - -- type: entity - id: bullet_24mml - name: 24mm bullet (L) - parent: BulletBaseL - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 10 - -- type: entity - id: bullet_24mmp - name: 24mm bullet (practice) - parent: BulletBasePractice - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_24mmr - name: 24mm bullet (rubber) - parent: BulletBaseRubber - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/ammunition.yml deleted file mode 100644 index 45714d8cb9..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/ammunition.yml +++ /dev/null @@ -1,376 +0,0 @@ -# Empty mags -- type: entity - id: magazine_45mm_empty - name: ".45mm magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A45mm - magazine: A45mm - capacity: 7 - - type: Sprite - netsync: false - -- type: entity - id: magazine_45mm_smg_empty - name: ".45mm SMG magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A45mm - magazine: A45mm - capacity: 30 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_45mm - name: ".45mm magazine" - parent: magazine_45mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm - caliber: A45mm - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45.rsi - state: 45-8 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45.rsi - state: 45-8 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 45 - steps: 9 - -- type: entity - id: magazine_45mmf - name: ".45mm magazine (flash)" - parent: magazine_45mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_flash - caliber: A45mm - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi - state: 45f-8 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi - state: 45f-8 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 45f - steps: 9 - -- type: entity - id: magazine_45mmhv - name: ".45mm magazine (high velocity)" - parent: magazine_45mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_hv - caliber: A45mm - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi - state: 45hv-8 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi - state: 45hv-8 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 45hv - steps: 9 - -- type: entity - id: magazine_45mml - name: ".45mm magazine (L)" - parent: magazine_45mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_l - caliber: A45mm - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi - state: 45l-8 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi - state: 45l-8 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 45l - steps: 9 - -- type: entity - id: magazine_45mmp - name: ".45mm magazine (practice)" - parent: magazine_45mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_p - caliber: A45mm - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi - state: 45p-8 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi - state: 45p-8 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 45p - steps: 9 - -- type: entity - id: magazine_45mmr - name: ".45mm magazine (rubber)" - parent: magazine_45mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_r - caliber: A45mm - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi - state: 45r-8 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi - state: 45r-8 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 45r - steps: 9 - -- type: entity - id: magazine_45mm_smg - name: ".45mm SMG magazine" - parent: magazine_45mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi - state: smg45-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi - state: smg45-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg45 - steps: 2 - -- type: entity - id: magazine_45mmf_smg - name: ".45mm SMG magazine (flash)" - parent: magazine_45mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_f - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi - state: smg45f-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi - state: smg45f-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg45f - steps: 2 - -- type: entity - id: magazine_45mmhv_smg - name: ".45mm SMG magazine (high velocity)" - parent: magazine_45mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_hv - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi - state: smg45hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi - state: smg45hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg45hv - steps: 2 - -- type: entity - id: magazine_45mml_smg - name: ".45mm SMG magazine (L)" - parent: magazine_45mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_l - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi - state: smg45l-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi - state: smg45l-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg45l - steps: 2 - -- type: entity - id: magazine_45mmp_smg - name: ".45mm SMG magazine (practice)" - parent: magazine_45mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_p - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi - state: smg45p-0 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi - state: smg45p-0 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg45p - steps: 1 - -- type: entity - id: magazine_45mmr_smg - name: ".45mm SMG magazine (rubber)" - parent: magazine_45mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_45mm_r - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi - state: smg45r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi - state: smg45r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg45r - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_45mm - name: ".45mm casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A45mm - projectile: bullet_45mm - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_45mm_flash - name: ".45mm casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A45mm - projectile: bullet_45mmf - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_45mm_hv - name: ".45mm casing (high velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A45mm - projectile: bullet_45mmhv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_45mm_l - name: ".45mm casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A45mm - projectile: bullet_45mml - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_45mm_p - name: ".45mm casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A45mm - projectile: bullet_45mmp - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_45mm_r - name: ".45mm casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A45mm - projectile: bullet_45mmr - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/boxes.yml deleted file mode 100644 index 7eb0e1f799..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/boxes.yml +++ /dev/null @@ -1,99 +0,0 @@ -# Empty boxes -- type: entity - id: box_45_empty - name: ".45mm box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A45mm - capacity: 30 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_45 - name: ".45mm box" - parent: box_45_empty - components: - - type: AmmoBox - fill: ammo_casing_45mm - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi - state: box45-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi - state: box45-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box45 - steps: 2 - -- type: entity - id: box_45f - name: ".45mm box (flash)" - parent: box_45_empty - components: - - type: AmmoBox - fill: ammo_casing_45mm_flash - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi - state: box45-flash-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi - state: box45-flash-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box45-flash - steps: 2 - -# Surprise: no HV - -- type: entity - id: box_45p - name: ".45mm box (practice)" - parent: box_45_empty - components: - - type: AmmoBox - fill: ammo_casing_45mm_p - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi - state: box45-practice-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi - state: box45-practice-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box45-practice - steps: 2 - -- type: entity - id: box_45r - name: ".45mm box (rubber)" - parent: box_45_empty - components: - - type: AmmoBox - fill: ammo_casing_45mm_r - caliber: A45mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi - state: box45-rubber-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi - state: box45-rubber-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box45-rubber - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml deleted file mode 100644 index 9935bba79a..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_45mm - name: .45mm bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 26 - -- type: entity - id: bullet_45mmf - name: .45mm bullet (flash) - parent: BulletBaseFlash - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 26 - -- type: entity - id: bullet_45mmhv - name: .45mm bullet (high-velocity) - parent: BulletBaseHighVelocity - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 24 - -- type: entity - id: bullet_45mml - name: .45mm bullet (L) - parent: BulletBaseL - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 26 - -- type: entity - id: bullet_45mmp - name: .45mm bullet (practice) - parent: BulletBasePractice - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_45mmr - name: .45mm bullet (rubber) - parent: BulletBaseRubber - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 4 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/ammunition.yml deleted file mode 100644 index c275cd265b..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/ammunition.yml +++ /dev/null @@ -1,221 +0,0 @@ -# Empty mags -- type: entity - id: magazine_556mm_empty - name: "5.56mm magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A556mm - magazine: A556mm - capacity: 20 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_556mm - name: "5.56mm magazine" - parent: magazine_556mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_556mm - caliber: A556mm - magazine: A556mm - capacity: 10 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi - state: 5.56-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi - state: 5.56-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 5.56 - steps: 2 - -- type: entity - id: magazine_556mms - name: "5.56mm magazine S" - parent: magazine_556mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_556mm - caliber: A556mm - magazine: A556mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi - state: 5.56s-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi - state: 5.56s-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 5.56s - steps: 2 - -- type: entity - id: magazine_556mm_win - name: "5.56mm magazine win" - parent: magazine_556mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_556mm - caliber: A556mm - magazine: A556mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi - state: WinMag-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi - state: WinMag-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: WinMag - steps: 2 - -- type: entity - id: magazine_556mm__winhv - name: "5.56mm magazine (high velocity)" - parent: magazine_556mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_556mm_highvelocity - caliber: A556mm - magazine: A556mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi - state: WinMag_h-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi - state: WinMag_h-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: WinMag_h - steps: 2 - -- type: entity - id: magazine_556mm_winr - name: "5.56mm magazine (rubber)" - parent: magazine_556mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_556mm_rubber - caliber: A556mm - magazine: A556mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi - state: WinMag_r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi - state: WinMag_r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: WinMag_r - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_556mm - name: "5.56mm casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A556mm - projectile: bullet_556mm - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_556mm_flash - name: "5.56mm casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A556mm - projectile: bullet_556mmf - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_556mm_highvelocity - name: "5.56mm casing (high-velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A556mm - projectile: bullet_556mmhv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_556mm_l - name: "5.56mm casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A556mm - projectile: bullet_556mml - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_556mm_practice - name: "5.56mm casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A556mm - projectile: bullet_556mmp - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_556mm_rubber - name: "5.56mm casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A556mm - projectile: bullet_556mmr - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/boxes.yml deleted file mode 100644 index e670a0ed60..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/boxes.yml +++ /dev/null @@ -1,55 +0,0 @@ -# Empty boxes -- type: entity - id: box_556mm_empty - name: "5.56mm box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A556mm - capacity: 80 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_556mm - name: "5.56mm box" - parent: box_556mm_empty - components: - - type: AmmoBox - fill: ammo_casing_556mm - caliber: A556mm - capacity: 80 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi - state: box556mm-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi - state: box556mm-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box556mm - steps: 2 - -- type: entity - id: box_556mmp - name: "5.56mm box (practice)" - parent: box_556mm_empty - components: - - type: AmmoBox - fill: ammo_casing_556mm_p - caliber: A556mm - capacity: 80 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi - state: box556mm-practice-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi - state: box556mm-practice-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box556mm-practice - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml deleted file mode 100644 index 3e546d1614..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_556mm - name: 5.56mm bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 16 - -- type: entity - id: bullet_556mmf - name: 5.56mm bullet (flash) - parent: BulletBaseFlash - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 16 - -- type: entity - id: bullet_556mmhv - name: 5.56mm bullet (high-velocity) - parent: BulletBaseHighVelocity - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 19 - -- type: entity - id: bullet_556mml - name: 5.56mm bullet (L) - parent: BulletBaseL - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 16 - -- type: entity - id: bullet_556mmp - name: 5.56mm bullet (practice) - parent: BulletBasePractice - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_556mmr - name: 5.56mm bullet (rubber) - parent: BulletBaseRubber - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/ammunition.yml deleted file mode 100644 index 815af2fc34..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/ammunition.yml +++ /dev/null @@ -1,237 +0,0 @@ -# Empty mags -- type: entity - id: magazine_65mm_empty - name: "6.5mm magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A65mm - magazine: A65mm - capacity: 30 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_65mm - name: "6.5mm magazine" - parent: magazine_65mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_65mm - caliber: A65mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi - state: mg_ih_sol-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi - state: mg_ih_sol-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_sol - steps: 2 - -- type: entity - id: magazine_65mmf - name: "6.5mm magazine (flash)" - parent: magazine_65mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_65mm_flash - caliber: A65mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi - state: mg_ih_sol_f-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi - state: mg_ih_sol_f-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_sol_f - steps: 2 - -- type: entity - id: magazine_65mmhv - name: "6.5mm magazine (high velocity)" - parent: magazine_65mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_65mm_hv - caliber: A65mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi - state: mg_ih_sol_hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi - state: mg_ih_sol_hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_sol_hv - steps: 2 - -- type: entity - id: magazine_65mml - name: "6.5mm magazine (L)" - parent: magazine_65mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_65mm_l - caliber: A65mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi - state: mg_ih_sol_l-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi - state: mg_ih_sol_l-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_sol_l - steps: 2 - -- type: entity - id: magazine_65mmp - name: "6.5mm magazine (practice)" - parent: magazine_65mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_65mm_p - caliber: A65mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi - state: mg_ih_sol_p-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi - state: mg_ih_sol_p-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_sol_p - steps: 2 - -- type: entity - id: magazine_65mmr - name: "6.5mm magazine (rubber)" - parent: magazine_65mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_65mm_r - caliber: A65mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi - state: mg_ih_sol_r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi - state: mg_ih_sol_r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_sol_r - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_65mm - name: "6.5mm casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A65mm - projectile: bullet_65mm - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_65mm_flash - name: "6.5mm casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A65mm - projectile: bullet_65mmf - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_65mm_hv - name: "6.5mm casing (high velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A65mm - projectile: bullet_65mmhv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_65mm_l - name: "6.5mm casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A65mm - projectile: bullet_65mml - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_65mm_p - name: "6.5mm casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A65mm - projectile: bullet_65mmp - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_65mm_r - name: "6.5mm casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A65mm - projectile: bullet_65mmr - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/boxes.yml deleted file mode 100644 index 1cf4f264ab..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/boxes.yml +++ /dev/null @@ -1,55 +0,0 @@ -# Empty boxes -- type: entity - id: box_65mm_empty - name: "6.5mm box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A65mm - capacity: 80 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_65mm - name: "6.5mm box" - parent: box_65mm_empty - components: - - type: AmmoBox - fill: ammo_casing_65mm - caliber: A65mm - capacity: 80 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi - state: box65mm-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi - state: box65mm-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box65mm - steps: 2 - -- type: entity - id: box_65mmr - name: "6.5mm box (rubber)" - parent: box_65mm_empty - components: - - type: AmmoBox - fill: ammo_casing_65mm_r - caliber: A65mm - capacity: 80 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi - state: box65mm-rubber-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi - state: box65mm-rubber-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box65mm-rubber - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml deleted file mode 100644 index 0ff44a311e..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_65mm - name: 6.5mm bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 18 - -- type: entity - id: bullet_65mmf - name: 6.5mm bullet (flash) - parent: BulletBaseFlash - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 18 - -- type: entity - id: bullet_65mmhv - name: 6.5mm bullet (high-velocity) - parent: BulletBaseHighVelocity - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 22 - -- type: entity - id: bullet_65mml - name: 6.5mm bullet (L) - parent: BulletBaseL - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 18 - -- type: entity - id: bullet_65mmp - name: 6.5mm bullet (practice) - parent: BulletBasePractice - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_65mmr - name: 6.5mm bullet (rubber) - parent: BulletBaseRubber - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/ammunition.yml deleted file mode 100644 index a9bf608bb6..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/ammunition.yml +++ /dev/null @@ -1,448 +0,0 @@ -# Empty mags -- type: entity - id: magazine_762mm_empty - name: "7.62mm magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A762mm - magazine: A762mm - capacity: 20 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_a762 - name: "A762 magazine" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi - state: a762_magazine-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi - state: a762_magazine-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: a762_magazine - steps: 2 - -- type: entity - id: magazine_aksr - name: "AK magazine (short rubber)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_rubber - caliber: A762mm - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi - state: AK_short_r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi - state: AK_short_r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: AK_short_r - steps: 2 - -- type: entity - id: magazine_ak - name: "AK magazine" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi - state: AKMag-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi - state: AKMag-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: AKMag - steps: 2 - -- type: entity - id: magazine_akf - name: "AK magazine (flash)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_flash - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi - state: AKMag_f-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi - state: AKMag_f-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: AKMag_f - steps: 2 - -- type: entity - id: magazine_akhv - name: "AK magazine (high-velocity)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_highvelocity - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi - state: AKMag_hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi - state: AKMag_hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: AKMag_hv - steps: 2 - -- type: entity - id: magazine_akl - name: "AK magazine (L)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_l - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi - state: AKMag_l-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi - state: AKMag_l-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: AKMag_l - steps: 2 - -- type: entity - id: magazine_akp - name: "AK magazine (practice)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_practice - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi - state: AKMag_p-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi - state: AKMag_p-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: AKMag_p - steps: 2 - -- type: entity - id: magazine_akr - name: "AK magazine (rubber)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_rubber - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi - state: AKMag_r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi - state: AKMag_r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: AKMag_r - steps: 2 - -- type: entity - id: magazine_c762 - name: "c762 magazine" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi - state: c762-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi - state: c762-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: c762 - steps: 2 - -- type: entity - id: magazine_c762f - name: "c762 magazine (flash)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_flash - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi - state: c762f-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi - state: c762f-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: c762f - steps: 2 - -- type: entity - id: magazine_c762hv - name: "c762 magazine (high-velocity)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_highvelocity - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi - state: c762hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi - state: c762hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: c762hv - steps: 2 - -- type: entity - id: magazine_c762l - name: "c762 magazine (L)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_l - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi - state: c762l-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi - state: c762l-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: c762l - steps: 2 - -- type: entity - id: magazine_c762p - name: "c762 magazine (practice)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_practice - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi - state: c762p-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi - state: c762p-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: c762p - steps: 2 - -- type: entity - id: magazine_c762r - name: "c762 magazine (rubber)" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm_rubber - caliber: A762mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi - state: c762r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi - state: c762r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: c762r - steps: 2 - -- type: entity - id: magazine_maxim - name: "maxim magazine" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm - caliber: A762mm - magazine: Maxim - capacity: 96 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi - state: maxim-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi - state: maxim-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: maxim - steps: 2 - -- type: entity - id: magazine_pk - name: "pk box" - parent: magazine_762mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_762mm - caliber: A762mm - capacity: 80 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi - state: pk_box-4 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi - state: pk_box-4 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: pk_box - steps: 5 - -# Casings - magazines above here -- type: entity - id: ammo_casing_762mm - name: "7.62mm casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A762mm - projectile: bullet_762mm - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_762mm_flash - name: "7.62mm casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A762mm - projectile: bullet_762mmf - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_762mm_highvelocity - name: "7.62mm casing (high velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A762mm - projectile: bullet_762mmhv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_762mm_l - name: "7.62mm casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A762mm - projectile: bullet_762mml - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_762mm_practice - name: "7.62mm casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A762mm - projectile: bullet_762mmp - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_762mm_rubber - name: "7.62mm casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A762mm - projectile: bullet_762mmr - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/boxes.yml deleted file mode 100644 index 3f300cbe6b..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/boxes.yml +++ /dev/null @@ -1,34 +0,0 @@ -# Empty boxes -- type: entity - id: box_762mm_empty - name: "7.62mm box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A762mm - capacity: 80 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_762mm - name: "7.62mm box" - parent: box_762mm_empty - components: - - type: AmmoBox - fill: ammo_casing_762mm - caliber: A762mm - capacity: 80 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi - state: box762mm-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi - state: box762mm-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box762mm - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml deleted file mode 100644 index 6613919894..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_762mm - name: 7.62mm bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 20 - -- type: entity - id: bullet_762mmf - name: 7.62mm bullet (flash) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 20 - -- type: entity - id: bullet_762mmhv - name: 7.62mm bullet (high-velocity) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 24 - -- type: entity - id: bullet_762mml - name: 7.62mm bullet (L) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 20 - -- type: entity - id: bullet_762mmp - name: 7.62mm bullet (practice) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_762mmr - name: 7.62mm bullet (rubber) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/ammunition.yml deleted file mode 100644 index 0edad4efc5..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/ammunition.yml +++ /dev/null @@ -1,398 +0,0 @@ -# Empty mags -- type: entity - id: magazine_9mm_empty - name: "9mm magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A9mm - magazine: A9mm - capacity: 10 - - type: Sprite - netsync: false - -- type: entity - id: magazine_9mm_smg_empty - name: "9mm SMG magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A9mm - magazine: A9mmSMG - capacity: 35 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_9mmtm - name: "9mm magazine (top-mounted)" - parent: magazine_9mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm - caliber: A9mm - magazine: A9mmTopMounted - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi - state: 9mmt-5 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi - state: 9mmt-5 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 9mmt - steps: 6 - -- type: entity - id: magazine_9mm - name: "9mm magazine" - parent: magazine_9mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm - caliber: A9mm - capacity: 10 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi - state: 9x19p-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi - state: 9x19p-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 9x19p - steps: 2 - -- type: entity - id: magazine_9mmf - name: "9mm magazine (flash)" - parent: magazine_9mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_flash - caliber: A9mm - capacity: 10 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi - state: 9x19pf-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi - state: 9x19pf-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 9x19pf - steps: 2 - -- type: entity - id: magazine_9mmhv - name: "9mm magazine (high velocity)" - parent: magazine_9mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_hv - caliber: A9mm - capacity: 10 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi - state: 9x19phv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi - state: 9x19phv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 9x19phv - steps: 2 - -- type: entity - id: magazine_9mml - name: "9mm magazine (L)" - parent: magazine_9mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_l - caliber: A9mm - capacity: 10 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi - state: 9x19pl-0 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi - state: 9x19pl-0 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 9x19pl - steps: 1 - -- type: entity - id: magazine_9mmp - name: "9mm magazine (practice)" - parent: magazine_9mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_p - caliber: A9mm - capacity: 10 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi - state: 9x19pp-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi - state: 9x19pp-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 9x19pp - steps: 2 - -- type: entity - id: magazine_9mmr - name: "9mm magazine (rubber)" - parent: magazine_9mm_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_r - caliber: A9mm - capacity: 10 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi - state: 9x19pr-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi - state: 9x19pr-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 9x19pr - steps: 2 - -- type: entity - id: magazine_9mm_smg - name: "9mm SMG magazine" - parent: magazine_9mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi - state: smg9mm-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi - state: smg9mm-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg9mm - steps: 2 - -- type: entity - id: magazine_9mmf_smg - name: "9mm SMG magazine (flash)" - parent: magazine_9mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_f - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi - state: smg9mmf-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi - state: smg9mmf-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg9mmf - steps: 2 - -- type: entity - id: magazine_9mmhv_smg - name: "9mm SMG magazine (high velocity)" - parent: magazine_9mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_hv - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi - state: smg9mmhv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi - state: smg9mmhv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg9mmhv - steps: 2 - -- type: entity - id: magazine_9mml_smg - name: "9mm SMG magazine (L)" - parent: magazine_9mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_l - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi - state: smg9mml-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi - state: smg9mml-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg9mml - steps: 2 - -- type: entity - id: magazine_9mmp_smg - name: "9mm SMG magazine (practice)" - parent: magazine_9mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_p - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi - state: smg9mmp-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi - state: smg9mmp-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg9mmp - steps: 2 - -- type: entity - id: magazine_9mmr_smg - name: "9mm SMG magazine (rubber)" - parent: magazine_9mm_smg_empty - components: - - type: BallisticMagazine - fill: ammo_casing_9mm_r - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi - state: smg9mmr-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi - state: smg9mmr-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: smg9mmr - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_9mm - name: "9mm casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A9mm - projectile: bullet_9mm - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_9mm_flash - name: "9mm casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A9mm - projectile: bullet_9mmf - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_9mm_hv - name: "9mm casing (high velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A9mm - projectile: bullet_9mmhv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_9mm_l - name: "9mm casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A9mm - projectile: bullet_9mml - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_9mm_p - name: "9mm casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A9mm - projectile: bullet_9mmp - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_9mm_r - name: "9mm casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A9mm - projectile: bullet_9mmr - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/boxes.yml deleted file mode 100644 index 53743d92f6..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/boxes.yml +++ /dev/null @@ -1,118 +0,0 @@ -# Empty boxes -- type: entity - id: box_9mm_empty - name: "9mm box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A9mm - capacity: 30 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_9mm - name: "9mm box" - parent: box_9mm_empty - components: - - type: AmmoBox - fill: ammo_casing_9mm - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi - state: box9mm-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi - state: box9mm-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box9mm - steps: 2 - -- type: entity - id: box_9mmf - name: "9mm box (flash)" - parent: box_9mm_empty - components: - - type: AmmoBox - fill: ammo_casing_9mm_flash - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi - state: box9mm-flash-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi - state: box9mm-flash-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box9mm-flash - steps: 2 - -- type: entity - id: box_9mmhv - name: "9mm box (high-velocity)" - parent: box_9mm_empty - components: - - type: AmmoBox - fill: ammo_casing_9mm_hv - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi - state: box9mm-hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi - state: box9mm-hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box9mm-hv - steps: 2 - -- type: entity - id: box_9mmp - name: "9mm box (practice)" - parent: box_9mm_empty - components: - - type: AmmoBox - fill: ammo_casing_9mm_p - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi - state: box9mm-practice-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi - state: box9mm-practice-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box9mm-practice - steps: 2 - -- type: entity - id: box_9mmr - name: "9mm box (rubber)" - parent: box_9mm_empty - components: - - type: AmmoBox - fill: ammo_casing_9mm_r - caliber: A9mm - capacity: 30 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi - state: box9mm-rubber-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi - state: box9mm-rubber-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box9mm-rubber - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml deleted file mode 100644 index 7ff905ca7d..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_9mm - name: 9mm bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 22 - -- type: entity - id: bullet_9mmf - name: 9mm bullet (flash) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 22 - -- type: entity - id: bullet_9mmhv - name: 9mm bullet (high-velocity) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 26 - -- type: entity - id: bullet_9mml - name: 9mm bullet (L) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 22 - -- type: entity - id: bullet_9mmp - name: 9mm bullet (practice) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_9mmr - name: 9mm bullet (rubber) - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml new file mode 100644 index 0000000000..7fcc34ab14 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/boxes.yml @@ -0,0 +1,26 @@ +- type: entity + id: BoxAntiMaterial + name: "ammunition box (.60 anti-material)" + parent: BaseItem + components: + - type: AmmoBox + caliber: AntiMaterial + capacity: 30 + fillPrototype: CartridgeAntiMaterial + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi + state: icon + - type: Sprite + netsync: false + sprite: Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml new file mode 100644 index 0000000000..318308a240 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/cartridges.yml @@ -0,0 +1,23 @@ +- type: entity + id: CartridgeAntiMaterial + name: cartridge (.60 anti-material) + parent: BaseItem + components: + - type: Ammo + caliber: AntiMaterial + projectile: BulletAntiMaterial + ammoVelocity: 30 + - type: Sprite + netsync: false + directional: false + sprite: Objects/Guns/Ammunition/Casings/large_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/large_casing.rsi + state: base + - type: Appearance + visuals: + - type: SpentAmmoVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/projectiles.yml new file mode 100644 index 0000000000..8459ae653d --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/AntiMaterial/projectiles.yml @@ -0,0 +1,9 @@ +- type: entity + id: BulletAntiMaterial + name: bullet (.60 anti-material) + parent: BulletBaseHV + abstract: true + components: + - type: Projectile + damages: + Brute: 70 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml new file mode 100644 index 0000000000..329536ea41 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/boxes.yml @@ -0,0 +1,129 @@ +- type: entity + id: BoxClRifleBase + name: "ammunition box (.25 caseless)" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: ClRifle + capacity: 30 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Boxes +- type: entity + id: BoxClRifle10x24 + name: "ammunition box (.25 caseless)" + parent: BoxClRifleBase + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeClRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi + +- type: entity + id: BoxClRifleBigBox + name: "ammunition box (.25 caseless)" + parent: BoxClRifleBase + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeClRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi + +- type: entity + id: BoxClRifleBigBoxRubber + name: "ammunition box (.25 caseless rubber)" + parent: BoxClRifleBase + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeClRifleRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi + +- type: entity + id: BoxClRifleBox + name: "ammunition box (.25 caseless)" + parent: BoxClRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeClRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi + +- type: entity + id: BoxClRifleBoxFlash + name: "ammunition box (.25 caseless flash)" + parent: BoxClRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeClRifleFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi + +- type: entity + id: BoxClRifleBoxHV + name: "ammunition box (.25 caseless high-velocity)" + parent: BoxClRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeClRifleHV + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi + +- type: entity + id: BoxClRifleBoxPractice + name: "ammunition box (.25 caseless practice)" + parent: BoxClRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeClRiflePractice + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi + +- type: entity + id: BoxClRifleBoxRubber + name: "ammunition box (.25 caseless rubber)" + parent: BoxClRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeClRifleRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml new file mode 100644 index 0000000000..8d390bc4ca --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/cartridges.yml @@ -0,0 +1,63 @@ +- type: entity + id: CartridgeClRifleBase + name: cartridge (.25 rifle) + parent: BaseItem + abstract: true + components: + - type: Ammo + caliber: ClRifle + - type: Sprite + netsync: false + directional: false + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + +- type: entity + id: CartridgeClRifle + name: cartridge (.25 caseless) + parent: CartridgeClRifleBase + components: + - type: Ammo + projectile: BulletClRifle + caseless: true + +- type: entity + id: CartridgeClRifleFlash + name: cartridge (.25 caseless flash) + parent: CartridgeClRifleBase + components: + - type: Ammo + projectile: BulletClRifleFlash + caseless: true + +- type: entity + id: CartridgeClRifleHV + name: cartridge (.25 caseless high-velocity) + parent: CartridgeClRifleBase + components: + - type: Ammo + projectile: BulletClRifleHV + ammoVelocity: 30 + caseless: true + +- type: entity + id: CartridgeClRiflePractice + name: cartridge (.25 caseless practice) + parent: CartridgeClRifleBase + components: + - type: Ammo + projectile: BulletClRiflePractice + caseless: true + +- type: entity + id: CartridgeClRifleRubber + name: cartridge (.25 caseless rubber) + parent: CartridgeClRifleBase + components: + - type: Ammo + projectile: BulletClRifleRubber + caseless: true diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml new file mode 100644 index 0000000000..1f5253a496 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/magazines.yml @@ -0,0 +1,235 @@ +# Empty mags +- type: entity + id: MagazineClRifleBase + name: "magazine (.25 caseless)" + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: ClRifle + magazineType: Rifle + capacity: 30 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Magazines +- type: entity + id: MagazineClRifle10x24 + name: "box magazine (.25 caseless)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifle + capacity: 99 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi + +- type: entity + id: MagazineClRiflePistol + name: "pistol magazine (.25 caseless)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifle + magazineType: Pistol + capacity: 10 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 6 + zeroVisible: false + +# No flash + +- type: entity + id: MagazineClRiflePistolHV + name: "pistol magazine (.25 caseless high-velocity)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifleHV + magazineType: Pistol + capacity: 10 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 6 + zeroVisible: false + +- type: entity + id: MagazineClRiflePistolPractice + name: "pistol magazine (.25 caseless practice)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRiflePractice + magazineType: Pistol + capacity: 10 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 6 + zeroVisible: false + +- type: entity + id: MagazineClRiflePistolRubber + name: "pistol magazine (.25 caseless rubber)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifleRubber + magazineType: Pistol + capacity: 10 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 6 + zeroVisible: false + +- type: entity + id: MagazineClRifle + name: "magazine (.25 caseless)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi + +- type: entity + id: MagazineClRifleHV + name: "magazine (.25 caseless high-velocity)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifleHV + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi + +- type: entity + id: MagazineClRiflePractice + name: "magazine (.25 caseless practice)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRiflePractice + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi + +- type: entity + id: MagazineClRifleRubber + name: "magazine (.25 caseless rubber)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifleRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi + +- type: entity + id: MagazineClRifleShort + name: "short magazine (.25 caseless)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifle + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi + +- type: entity + id: MagazineClRifleShortFlash + name: "short magazine (.25 caseless flash)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifleFlash + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi + +- type: entity + id: MagazineClRifleShortHV + name: "short magazine (.25 caseless high-velocity)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifleHV + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi + +- type: entity + id: MagazineClRifleShortPractice + name: "short magazine (.25 caseless practice)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRiflePractice + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi + +- type: entity + id: MagazineClRifleShortRubber + name: "short magazine (.25 caseless rubber)" + parent: MagazineClRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeClRifleRubber + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/projectiles.yml new file mode 100644 index 0000000000..b1f01dcc2b --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/ClRifle/projectiles.yml @@ -0,0 +1,49 @@ +- type: entity + id: BulletClRifle + name: bullet (.25 caseless) + parent: BulletBase + abstract: true + components: + - type: Projectile + damages: + Brute: 27 + +- type: entity + id: BulletClRifleFlash + name: bullet (.25 caseless flash) + parent: BulletBaseFlash + abstract: true + components: + - type: Projectile + damages: + Brute: 27 + +- type: entity + id: BulletClRifleHV + name: bullet (.25 caseless high-velocity) + parent: BulletBaseHV + abstract: true + components: + - type: Projectile + damages: + Brute: 32 + +- type: entity + id: BulletClRiflePractice + name: bullet (.25 caseless practice) + parent: BulletBasePractice + abstract: true + components: + - type: Projectile + damages: + Brute: 2 + +- type: entity + id: BulletClRifleRubber + name: bullet (.25 caseless rubber) + parent: BulletBaseRubber + abstract: true + components: + - type: Projectile + damages: + Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml new file mode 100644 index 0000000000..9f4713101c --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Explosives/ammunition.yml @@ -0,0 +1,106 @@ +- type: entity + id: RocketAmmo + name: PG-7VL grenade + parent: BaseItem + description: A 1.5 warhead designed for the RPG-7 launcher. Has tubular shape. + components: + - type: Ammo + caliber: Rocket + projectile: BulletRocket + caseless: true + - type: Sprite + netsync: false + sprite: Objects/Guns/Ammunition/Explosives/rpg.rsi + state: frag + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Explosives/rpg.rsi + state: frag + +- type: entity + id: GrenadeBaton + name: baton grenade + parent: BaseItem + components: + - type: Ammo + caliber: Grenade + projectile: BulletGrenadeBaton + - type: Sprite + netsync: false + sprite: Objects/Guns/Ammunition/Explosives/grenade_baton.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Explosives/grenade_baton.rsi + state: base + - type: Appearance + visuals: + - type: SpentAmmoVisualizer2D + +- type: entity + id: GrenadeBlast + name: blast grenade + parent: BaseItem + components: + - type: Ammo + caliber: Grenade + projectile: BulletGrenadeBlast + - type: Sprite + netsync: false + sprite: Objects/Guns/Ammunition/Explosives/grenade_blast.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Explosives/grenade_blast.rsi + state: base + - type: Appearance + visuals: + - type: SpentAmmoVisualizer2D + +- type: entity + id: GrenadeFlash + name: flash grenade + parent: BaseItem + components: + - type: Ammo + caliber: Grenade + projectile: BulletGrenadeFlash + - type: Sprite + netsync: false + sprite: Objects/Guns/Ammunition/Explosives/grenade_flash.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Explosives/grenade_flash.rsi + state: base + - type: Appearance + visuals: + - type: SpentAmmoVisualizer2D + +- type: entity + id: GrenadeFrag + name: frag grenade + parent: BaseItem + components: + - type: Ammo + caliber: Grenade + projectile: BulletGrenadeFrag + - type: Sprite + netsync: false + sprite: Objects/Guns/Ammunition/Explosives/grenade_frag.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Explosives/grenade_frag.rsi + state: base + - type: Appearance + visuals: + - type: SpentAmmoVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml new file mode 100644 index 0000000000..388ce6e199 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/boxes.yml @@ -0,0 +1,77 @@ +- type: entity + id: BoxLRifleBase + name: "ammunition box (.30 rifle)" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: LRifle + capacity: 30 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Boxes +- type: entity + id: BoxLRifleBigBox + name: "ammunition box (.30 rifle)" + parent: BoxLRifleBase + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeLRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi + +- type: entity + id: BoxLRifleBoxHV + name: "ammunition box (.30 rifle high-velocity)" + parent: BoxLRifleBase + components: + - type: AmmoBox + capacity: 50 + fillPrototype: CartridgeLRifleHV + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi + +- type: entity + id: BoxLRifleBoxPractice + name: "ammunition box (.30 rifle practice)" + parent: BoxLRifleBase + components: + - type: AmmoBox + capacity: 50 + fillPrototype: CartridgeLRiflePractice + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi + +- type: entity + id: BoxLRifleBoxRubber + name: "ammunition box (.30 rifle rubber)" + parent: BoxLRifleBase + components: + - type: AmmoBox + capacity: 50 + fillPrototype: CartridgeLRifleRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml new file mode 100644 index 0000000000..13b526ecbc --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/cartridges.yml @@ -0,0 +1,58 @@ +- type: entity + id: CartridgeLRifleBase + name: cartridge (.30 rifle) + parent: BaseItem + abstract: true + components: + - type: Ammo + caliber: LRifle + - type: Sprite + netsync: false + directional: false + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + +- type: entity + id: CartridgeLRifle + name: cartridge (.30 rifle) + parent: CartridgeLRifleBase + components: + - type: Ammo + projectile: BulletLRifle + +- type: entity + id: CartridgeLRifleFlash + name: cartridge (.30 rifle flash) + parent: CartridgeLRifleBase + components: + - type: Ammo + projectile: BulletLRifleFlash + +- type: entity + id: CartridgeLRifleHV + name: cartridge (.30 rifle high-velocity) + parent: CartridgeLRifleBase + components: + - type: Ammo + projectile: BulletLRifleHV + ammoVelocity: 30 + +- type: entity + id: CartridgeLRiflePractice + name: cartridge (.30 rifle practice) + parent: CartridgeLRifleBase + components: + - type: Ammo + projectile: BulletLRiflePractice + +- type: entity + id: CartridgeLRifleRubber + name: cartridge (.30 rifle rubber) + parent: CartridgeLRifleBase + components: + - type: Ammo + projectile: BulletLRifleRubber diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml new file mode 100644 index 0000000000..699a753350 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/magazines.yml @@ -0,0 +1,141 @@ +# Empty mags +- type: entity + id: MagazineLRifleBase + name: "magazine (.30 rifle)" + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: LRifle + magazineType: Rifle + capacity: 30 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Magazines +- type: entity + id: MagazineLRifleBox + name: "magazine box (.30 rifle)" + parent: MagazineLRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeLRifle + magazineType: Box + capacity: 50 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 8 + zeroVisible: false + +- type: entity + id: MagazineLRifle + name: "magazine (.30 rifle)" + parent: MagazineLRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeLRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi + +- type: entity + id: MagazineLRifleFlash + name: "magazine (.30 rifle flash)" + parent: MagazineLRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeLRifleFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi + +- type: entity + id: MagazineLRifleHV + name: "magazine (.30 rifle high-velocity)" + parent: MagazineLRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeLRifleHV + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi + +- type: entity + id: MagazineLRiflePractice + name: "magazine (.30 rifle practice)" + parent: MagazineLRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeLRiflePractice + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi + +- type: entity + id: MagazineLRifleRubber + name: "magazine (.30 rifle rubber)" + parent: MagazineLRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeLRifleRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi + +- type: entity + id: MagazineLRifleMaxim + name: "pan magazine (.30 rifle)" + parent: MagazineLRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeLRifle + capacity: 96 + magazineType: Pan + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi + +- type: entity + id: MagazineLRiflePkBox + name: "PK munitions box (.30 rifle)" + parent: MagazineLRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeLRifle + magazineType: Box + capacity: 80 + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 7 + zeroVisible: false diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/projectiles.yml new file mode 100644 index 0000000000..5752d74505 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/projectiles.yml @@ -0,0 +1,49 @@ +- type: entity + id: BulletLRifle + name: bullet (.20 rifle) + parent: BulletBase + abstract: true + components: + - type: Projectile + damages: + Brute: 28 + +- type: entity + id: BulletLRifleFlash + name: bullet (.20 rifle flash) + parent: BulletBaseFlash + abstract: true + components: + - type: Projectile + damages: + Brute: 28 + +- type: entity + id: BulletLRifleHV + name: bullet (.20 rifle high-velocity) + parent: BulletBaseHV + abstract: true + components: + - type: Projectile + damages: + Brute: 30 + +- type: entity + id: BulletLRiflePractice + name: bullet (.20 rifle practice) + parent: BulletBasePractice + abstract: true + components: + - type: Projectile + damages: + Brute: 2 + +- type: entity + id: BulletLRifleRubber + name: bullet (.20 rifle rubber) + parent: BulletBaseRubber + abstract: true + components: + - type: Projectile + damages: + Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml new file mode 100644 index 0000000000..b056dc269d --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/LRifle/speed_loaders.yml @@ -0,0 +1,26 @@ +- type: entity + id: SLLRifle + name: "speed loader (.30 rifle)" + parent: BaseItem + components: + - type: SpeedLoader + caliber: LRifle + capacity: 5 + fillPrototype: CartridgeLRifle + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi + state: icon + - type: Sprite + netsync: false + sprite: Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-5 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 6 + zeroVisible: false \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml new file mode 100644 index 0000000000..d328f29002 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/boxes.yml @@ -0,0 +1,90 @@ +- type: entity + id: BoxMagnumBase + name: "ammunition box (.40 magnum)" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: Magnum + capacity: 30 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Boxes +- type: entity + id: BoxMagnum + name: "ammunition box (.40 magnum)" + parent: BoxMagnumBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeMagnum + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi + +- type: entity + id: BoxMagnumFlash + name: "ammunition box (.40 magnum flash)" + parent: BoxMagnumBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeMagnumFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi + +- type: entity + id: BoxMagnumHV + name: "ammunition box (.40 magnum high-velocity)" + parent: BoxMagnumBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeMagnumHV + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi + +- type: entity + id: BoxMagnumPractice + name: "ammunition box (.40 magnum practice)" + parent: BoxMagnumBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeMagnumPractice + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi + +- type: entity + id: BoxMagnumRubber + name: "ammunition box (.40 magnum rubber)" + parent: BoxMagnumBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeMagnumRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml new file mode 100644 index 0000000000..c9beea957a --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/cartridges.yml @@ -0,0 +1,58 @@ +- type: entity + id: CartridgeMagnumBase + name: cartridge (.40 magnum) + parent: BaseItem + abstract: true + components: + - type: Ammo + caliber: Magnum + - type: Sprite + netsync: false + directional: false + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + +- type: entity + id: CartridgeMagnum + name: cartridge (.40 magnum) + parent: CartridgeMagnumBase + components: + - type: Ammo + projectile: BulletMagnum + +- type: entity + id: CartridgeMagnumFlash + name: cartridge (.40 magnum flash) + parent: CartridgeMagnumBase + components: + - type: Ammo + projectile: BulletMagnumFlash + +- type: entity + id: CartridgeMagnumHV + name: cartridge (.40 magnum high-velocity) + parent: CartridgeMagnumBase + components: + - type: Ammo + projectile: BulletMagnumHV + ammoVelocity: 30 + +- type: entity + id: CartridgeMagnumPractice + name: cartridge (.40 magnum practice) + parent: CartridgeMagnumBase + components: + - type: Ammo + projectile: BulletMagnumPractice + +- type: entity + id: CartridgeMagnumRubber + name: cartridge (.40 magnum rubber) + parent: CartridgeMagnumBase + components: + - type: Ammo + projectile: BulletMagnumRubber diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml new file mode 100644 index 0000000000..d8de32ec80 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/magazines.yml @@ -0,0 +1,161 @@ +# Empty mags +- type: entity + id: MagazineMagnumBase + name: "magazine (.40 magnum)" + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: Magnum + magazineType: Pistol + capacity: 10 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 5 + zeroVisible: false + +- type: entity + id: MagazineMagnumSmgBase + name: "SMG Magazine (.40 magnum)" + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: Magnum + magazineType: Smg + capacity: 25 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Magazines +- type: entity + id: MagazineMagnum + name: "magazine (.40 magnum)" + parent: MagazineMagnumBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnum + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi + +- type: entity + id: MagazineMagnumFlash + name: "magazine (.40 magnum flash)" + parent: MagazineMagnumBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnumFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi + +- type: entity + id: MagazineMagnumHV + name: "magazine (.40 magnum high-velocity)" + parent: MagazineMagnumBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnumHV + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi + +- type: entity + id: MagazineMagnumPractice + name: "magazine (.40 magnum practice)" + parent: MagazineMagnumBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnumPractice + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi + +- type: entity + id: MagazineMagnumRubber + name: "magazine (.40 magnum rubber)" + parent: MagazineMagnumBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnumRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi + +- type: entity + id: MagazineMagnumSmg + name: "SMG Magazine (.40 magnum)" + parent: MagazineMagnumSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnum + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi + +- type: entity + id: MagazineMagnumSmgHV + name: "SMG Magazine (.40 magnum High-Velocity)" + parent: MagazineMagnumSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnumHV + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi + +- type: entity + id: MagazineMagnumSmgPractice + name: "SMG Magazine (.40 magnum practice)" + parent: MagazineMagnumSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnumPractice + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi + +- type: entity + id: MagazineMagnumSmgRubber + name: "SMG Magazine (.40 magnum rubber)" + parent: MagazineMagnumSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgeMagnumRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/projectiles.yml new file mode 100644 index 0000000000..63b79a8161 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/projectiles.yml @@ -0,0 +1,49 @@ +- type: entity + id: BulletMagnum + name: bullet (.40 magnum) + parent: BulletBase + abstract: true + components: + - type: Projectile + damages: + Brute: 32 + +- type: entity + id: BulletMagnumFlash + name: bullet (.40 magnum flash) + parent: BulletBaseFlash + abstract: true + components: + - type: Projectile + damages: + Brute: 32 + +- type: entity + id: BulletMagnumHV + name: bullet (.40 magnum high-velocity) + parent: BulletBaseHV + abstract: true + components: + - type: Projectile + damages: + Brute: 35 + +- type: entity + id: BulletMagnumPractice + name: bullet (.40 magnum practice) + parent: BulletBasePractice + abstract: true + components: + - type: Projectile + damages: + Brute: 1 + +- type: entity + id: BulletMagnumRubber + name: bullet (.40 magnum rubber) + parent: BulletBaseRubber + abstract: true + components: + - type: Projectile + damages: + Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml new file mode 100644 index 0000000000..4138c655fe --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Magnum/speed_loaders.yml @@ -0,0 +1,84 @@ +- type: entity + id: SLMagnumBase + name: "speed loader (.40 magnum)" + parent: BaseItem + abstract: true + components: + - type: SpeedLoader + caliber: Magnum + capacity: 6 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-6 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 7 + zeroVisible: false + +- type: entity + id: SLMagnum + name: "speed loader (.40 magnum)" + parent: SLMagnumBase + components: + - type: SpeedLoader + fillPrototype: CartridgeMagnum + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi + +- type: entity + id: SLMagnumFlash + name: "speed loader (.40 magnum flash)" + parent: SLMagnumBase + components: + - type: SpeedLoader + fillPrototype: CartridgeMagnumFlash + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi + +- type: entity + id: SLMagnumHV + name: "speed loader (.40 magnum high-velocity)" + parent: SLMagnumBase + components: + - type: SpeedLoader + fillPrototype: CartridgeMagnumHV + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi + +- type: entity + id: SLMagnumPractice + name: "speed loader (.40 magnum practice)" + parent: SLMagnumBase + components: + - type: SpeedLoader + fillPrototype: CartridgeMagnumPractice + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi + +- type: entity + id: SLMagnumRubber + name: "speed loader (.40 magnum rubber)" + parent: SLMagnumBase + components: + - type: SpeedLoader + fillPrototype: CartridgeMagnumRubber + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml new file mode 100644 index 0000000000..9a42990627 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/boxes.yml @@ -0,0 +1,90 @@ +- type: entity + id: BoxPistolBase + name: "ammunition box (.35 auto)" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: Pistol + capacity: 30 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Boxes +- type: entity + id: BoxPistolBox + name: "ammunition box (.35 auto)" + parent: BoxPistolBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi + +- type: entity + id: BoxPistolBoxFlash + name: "ammunition box (.35 auto flash)" + parent: BoxPistolBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgePistolFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi + +- type: entity + id: BoxPistolBoxHV + name: "ammunition box (.35 auto high-velocity)" + parent: BoxPistolBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgePistolHV + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi + +- type: entity + id: BoxPistolBoxPractice + name: "ammunition box (.35 auto practice)" + parent: BoxPistolBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgePistolPractice + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi + +- type: entity + id: BoxPistolBoxRubber + name: "ammunition box (.35 auto rubber)" + parent: BoxPistolBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgePistolRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml new file mode 100644 index 0000000000..e10bbbef06 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/cartridges.yml @@ -0,0 +1,58 @@ +- type: entity + id: CartridgePistolBase + name: cartridge (.35 auto) + parent: BaseItem + abstract: true + components: + - type: Ammo + caliber: Pistol + - type: Sprite + netsync: false + directional: false + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + +- type: entity + id: CartridgePistol + name: cartridge (.35 auto) + parent: CartridgePistolBase + components: + - type: Ammo + projectile: BulletPistol + +- type: entity + id: CartridgePistolFlash + name: cartridge (.35 auto flash) + parent: CartridgePistolBase + components: + - type: Ammo + projectile: BulletPistolFlash + +- type: entity + id: CartridgePistolHV + name: cartridge (.35 auto high-velocity) + parent: CartridgePistolBase + components: + - type: Ammo + projectile: BulletPistolHV + ammoVelocity: 30 + +- type: entity + id: CartridgePistolPractice + name: cartridge (.35 auto practice) + parent: CartridgePistolBase + components: + - type: Ammo + projectile: BulletPistolPractice + +- type: entity + id: CartridgePistolRubber + name: cartridge (.35 auto rubber) + parent: CartridgePistolBase + components: + - type: Ammo + projectile: BulletPistolRubber diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml new file mode 100644 index 0000000000..9297fd2f18 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/magazines.yml @@ -0,0 +1,270 @@ +- type: entity + id: MagazinePistolBase + name: magazine (.35 auto) + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: Pistol + magazineType: Pistol + capacity: 10 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 5 + zeroVisible: false + +- type: entity + id: MagazinePistolHCBase + name: high-capacity magazine (.35 auto) + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: Pistol + magazineType: HCPistol + capacity: 16 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 7 + zeroVisible: false + +- type: entity + id: MagazinePistolSmgBase # Yeah it's weird but it's pistol caliber + name: SMG magazine (.35 auto) + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: Pistol + magazineType: Smg + capacity: 35 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Magazines +- type: entity + id: MagazinePistolSmgTopMounted + name: SMG magazine (.35 auto top-mounted) + parent: MagazinePistolSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-1 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 6 + zeroVisible: false + +- type: entity + id: MagazinePistol + name: magazine (.35 auto) + parent: MagazinePistolBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + +- type: entity + id: MagazinePistolFlash + name: magazine (.35 auto flash) + parent: MagazinePistolBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistolFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi + +- type: entity + id: MagazinePistolHV + name: magazine (.35 auto high-velocity) + parent: MagazinePistolBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistolHV + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi + +- type: entity + id: MagazinePistolPractice + name: magazine (.35 auto practice) + parent: MagazinePistolBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistolPractice + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi + +- type: entity + id: MagazinePistolRubber + name: magazine (.35 auto rubber) + parent: MagazinePistolBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistolRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi + +- type: entity + id: MagazineHCPistol + name: high-capacity magazine (.35 auto) + parent: MagazinePistolHCBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi + +- type: entity + id: MagazineHCPistolHV + name: high-capacity magazine (.35 auto high-velocity) + parent: MagazinePistolHCBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi + +- type: entity + id: MagazineHCPistolPractice + name: high-capacity magazine (.35 auto practice) + parent: MagazinePistolHCBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi + +- type: entity + id: MagazineHCPistolRubber + name: high-capacity magazine (.35 auto rubber) + parent: MagazinePistolHCBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi + +- type: entity + id: MagazinePistolSmg + name: SMG Magazine (.35 auto) + parent: MagazinePistolSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + +- type: entity + id: MagazinePistolSmgFlash + name: SMG Magazine (.35 auto flash) + parent: MagazinePistolSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistolFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi + +- type: entity + id: MagazinePistolSmgHV + name: SMG Magazine (.35 auto high-velocity) + parent: MagazinePistolSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistolHV + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi + +- type: entity + id: MagazinePistolSmgPractice + name: SMG Magazine (.35 auto practice) + parent: MagazinePistolSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistolPractice + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi + +- type: entity + id: MagazinePistolSmgRubber + name: SMG Magazine (.35 auto rubber) + parent: MagazinePistolSmgBase + components: + - type: RangedMagazine + fillPrototype: CartridgePistolRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/projectiles.yml new file mode 100644 index 0000000000..3af7a3e30a --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/projectiles.yml @@ -0,0 +1,49 @@ +- type: entity + id: BulletPistol + name: bullet (.35 auto) + parent: BulletBase + abstract: true + components: + - type: Projectile + damages: + Brute: 24 + +- type: entity + id: BulletPistolFlash + name: bullet (.35 auto flash) + parent: BulletBaseFlash + abstract: true + components: + - type: Projectile + damages: + Brute: 24 + +- type: entity + id: BulletPistolHV + name: bullet (.35 auto high-velocity) + parent: BulletBaseHV + abstract: true + components: + - type: Projectile + damages: + Brute: 28 + +- type: entity + id: BulletPistolPractice + name: bullet (.35 auto practice) + parent: BulletBasePractice + abstract: true + components: + - type: Projectile + damages: + Brute: 2 + +- type: entity + id: BulletPistolRubber + name: bullet (.35 auto rubber) + parent: BulletBaseRubber + abstract: true + components: + - type: Projectile + damages: + Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml new file mode 100644 index 0000000000..813c230dc3 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Pistol/speed_loaders.yml @@ -0,0 +1,84 @@ +- type: entity + id: SLPistolBase + name: "speed loader (.35 auto)" + parent: BaseItem + abstract: true + components: + - type: SpeedLoader + caliber: Pistol + capacity: 6 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-6 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 7 + zeroVisible: false + +- type: entity + id: SLPistol + name: "speed loader (.35 auto)" + parent: SLPistolBase + components: + - type: SpeedLoader + fillPrototype: CartridgePistol + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi + +- type: entity + id: SLPistolFlash + name: "speed loader (.35 auto flash)" + parent: SLPistolBase + components: + - type: SpeedLoader + fillPrototype: CartridgePistolFlash + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi + +- type: entity + id: SLPistolHV + name: "speed loader (.35 auto high-velocity)" + parent: SLPistolBase + components: + - type: SpeedLoader + fillPrototype: CartridgePistolHV + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi + +- type: entity + id: SLPistolPractice + name: "speed loader (.35 auto practice)" + parent: SLPistolBase + components: + - type: SpeedLoader + fillPrototype: CartridgePistolPractice + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi + +- type: entity + id: SLPistolRubber + name: "speed loader (.35 auto rubber)" + parent: SLPistolBase + components: + - type: SpeedLoader + fillPrototype: CartridgePistolRubber + - type: Icon + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/ammunition.yml deleted file mode 100644 index 5f0bed655a..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/ammunition.yml +++ /dev/null @@ -1,237 +0,0 @@ -# Empty mags -- type: entity - id: magazine_32_empty - name: ".32 magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A32 - magazine: A32 - capacity: 7 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_32 - name: ".32 magazine" - parent: magazine_32_empty - components: - - type: BallisticMagazine - fill: ammo_casing_32 - caliber: A32 - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi - state: 32trauma-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi - state: 32trauma-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 32trauma - steps: 2 - -- type: entity - id: magazine_32f - name: ".32 magazine (flash)" - parent: magazine_32_empty - components: - - type: BallisticMagazine - fill: ammo_casing_32_flash - caliber: A32 - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi - state: 32trauma_f-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi - state: 32trauma_f-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 32trauma_f - steps: 2 - -- type: entity - id: magazine_32hv - name: ".32 magazine (high velocity)" - parent: magazine_32_empty - components: - - type: BallisticMagazine - fill: ammo_casing_32_hv - caliber: A32 - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi - state: 32trauma_hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi - state: 32trauma_hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 32trauma_hv - steps: 2 - -- type: entity - id: magazine_32l - name: ".32 magazine (L)" - parent: magazine_32_empty - components: - - type: BallisticMagazine - fill: ammo_casing_32_l - caliber: A32 - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi - state: 32trauma_l-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi - state: 32trauma_l-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 32trauma_l - steps: 2 - -- type: entity - id: magazine_32p - name: ".32 magazine (practice)" - parent: magazine_32_empty - components: - - type: BallisticMagazine - fill: ammo_casing_32_p - caliber: A32 - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi - state: 32trauma_p-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi - state: 32trauma_p-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 32trauma_p - steps: 2 - -- type: entity - id: magazine_32r - name: ".32 magazine (rubber)" - parent: magazine_32_empty - components: - - type: BallisticMagazine - fill: ammo_casing_32_r - caliber: A32 - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi - state: 32trauma_r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi - state: 32trauma_r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 32trauma_r - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_32 - name: ".32 casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A32 - projectile: bullet_32 - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_32_flash - name: ".32 casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A32 - projectile: bullet_32f - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_32_hv - name: ".32 casing (high velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A32 - projectile: bullet_32hv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_32_l - name: ".32 casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A32 - projectile: bullet_32l - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_32_p - name: ".32 casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A32 - projectile: bullet_32p - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_32_r - name: ".32 casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A32 - projectile: bullet_32r - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/boxes.yml deleted file mode 100644 index 1260250a1b..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/boxes.yml +++ /dev/null @@ -1,118 +0,0 @@ -# Empty boxes -- type: entity - id: box_32_empty - name: ".32 box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A32 - capacity: 40 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_32 - name: ".32 box" - parent: box_32_empty - components: - - type: AmmoBox - fill: ammo_casing_32 - caliber: A32 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.32/box32.rsi - state: box32-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.32/box32.rsi - state: box32-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box32 - steps: 2 - -- type: entity - id: box_32f - name: ".32 box (flash)" - parent: box_32_empty - components: - - type: AmmoBox - fill: ammo_casing_32_flash - caliber: A32 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi - state: box32-flash-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi - state: box32-flash-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box32-flash - steps: 2 - -- type: entity - id: box_32hv - name: ".32 box (high-velocity)" - parent: box_32_empty - components: - - type: AmmoBox - fill: ammo_casing_32_hv - caliber: A32 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi - state: box32-hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi - state: box32-hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box32-hv - steps: 2 - -- type: entity - id: box_32p - name: ".32 box (practice)" - parent: box_32_empty - components: - - type: AmmoBox - fill: ammo_casing_32_p - caliber: A32 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi - state: box32-practice-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi - state: box32-practice-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box32-practice - steps: 2 - -- type: entity - id: box_32r - name: ".32 box (rubber)" - parent: box_32_empty - components: - - type: AmmoBox - fill: ammo_casing_32_r - caliber: A32 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi - state: box32-rubber-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi - state: box32-rubber-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box32-rubber - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml deleted file mode 100644 index 677a4d8f79..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_32 - name: .32 bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 20 - -- type: entity - id: bullet_32f - name: .32 bullet (flash) - parent: BulletBaseFlash - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 20 - -- type: entity - id: bullet_32hv - name: .32 bullet (high-velocity) - parent: BulletBaseHighVelocity - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 24 - -- type: entity - id: bullet_32l - name: .32 bullet (L) - parent: BulletBaseL - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 20 - -- type: entity - id: bullet_32p - name: .32 bullet (practice) - parent: BulletBasePractice - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_32r - name: .32 bullet (rubber) - parent: BulletBaseRubber - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/ammunition.yml deleted file mode 100644 index 22eff3b229..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/ammunition.yml +++ /dev/null @@ -1,111 +0,0 @@ -## Empty mags -#- type: entity -# id: magazine_357_empty -# name: ".357 magazine - empty" -# parent: BaseItem -# abstract: true -# components: -# - type: BallisticMagazine -# caliber: A357 -# magazine: A357 -# capacity: 6 -# - type: Sprite -# netsync: false -# -## Magazines -## Casings - magazines above here -#- type: entity -# id: ammo_casing_357 -# name: ".357 casing" -# parent: BaseItem -# components: -# - type: BallisticBullet -# caliber: A357 -# projectile: bullet_357 -# - type: Sprite -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# drawdepth: FloorObjects -# - type: Icon -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# -#- type: entity -# id: ammo_casing_357_flash -# name: ".357 casing (flash)" -# parent: BaseItem -# components: -# - type: BallisticBullet -# caliber: A357 -# projectile: bullet_357f -# - type: Sprite -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# drawdepth: FloorObjects -# - type: Icon -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# -#- type: entity -# id: ammo_casing_357_hv -# name: ".357 casing (high velocity)" -# parent: BaseItem -# components: -# - type: BallisticBullet -# caliber: A357 -# projectile: bullet_357hv -# - type: Sprite -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# drawdepth: FloorObjects -# - type: Icon -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# -#- type: entity -# id: ammo_casing_357_l -# name: ".357 casing (L)" -# parent: BaseItem -# components: -# - type: BallisticBullet -# caliber: A357 -# projectile: bullet_357l -# - type: Sprite -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# drawdepth: FloorObjects -# - type: Icon -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# -#- type: entity -# id: ammo_casing_357_p -# name: ".357 casing (practice)" -# parent: BaseItem -# components: -# - type: BallisticBullet -# caliber: A357 -# projectile: bullet_357p -# - type: Sprite -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# drawdepth: FloorObjects -# - type: Icon -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# -#- type: entity -# id: ammo_casing_357_r -# name: ".357 casing (rubber)" -# parent: BaseItem -# components: -# - type: BallisticBullet -# caliber: A357 -# projectile: bullet_357r -# - type: Sprite -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing -# drawdepth: FloorObjects -# - type: Icon -# sprite: Objects/Guns/Ammunition/ammo_casing.rsi -# state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/boxes.yml deleted file mode 100644 index 340513b315..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/boxes.yml +++ /dev/null @@ -1,118 +0,0 @@ -# Empty boxes -- type: entity - id: box_357_empty - name: ".357 box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A357 - capacity: 40 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_357 - name: ".357 box" - parent: box_357_empty - components: - - type: AmmoBox - fill: ammo_casing_357 - caliber: A357 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.357/box357.rsi - state: box357-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.357/box357.rsi - state: box357-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box357 - steps: 2 - -- type: entity - id: box_357f - name: ".357 box (flash)" - parent: box_357_empty - components: - - type: AmmoBox - fill: ammo_casing_357_flash - caliber: A357 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi - state: box357-flash-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi - state: box357-flash-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box357-flash - steps: 2 - -- type: entity - id: box_357hv - name: ".357 box (high-velocity)" - parent: box_357_empty - components: - - type: AmmoBox - fill: ammo_casing_357_hv - caliber: A357 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi - state: box357-hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi - state: box357-hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box357-hv - steps: 2 - -- type: entity - id: box_357p - name: ".357 box (practice)" - parent: box_357_empty - components: - - type: AmmoBox - fill: ammo_casing_357_p - caliber: A357 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi - state: box357-practice-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi - state: box357-practice-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box357-practice - steps: 2 - -- type: entity - id: box_357r - name: ".357 box (rubber)" - parent: box_357_empty - components: - - type: AmmoBox - fill: ammo_casing_357_r - caliber: A357 - capacity: 40 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi - state: box357-rubber-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi - state: box357-rubber-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box357-rubber - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml deleted file mode 100644 index 81a3967cbd..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_357 - name: .357 bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 40 - -- type: entity - id: bullet_357f - name: .357 bullet (flash) - parent: BulletBaseFlash - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 40 - -- type: entity - id: bullet_357hv - name: .357 bullet (high-velocity) - parent: BulletBaseHighVelocity - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 48 - -- type: entity - id: bullet_357l - name: .357 bullet (L) - parent: BulletBaseL - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 40 - -- type: entity - id: bullet_357p - name: .357 bullet (practice) - parent: BulletBasePractice - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_357r - name: .357 bullet (rubber) - parent: BulletBaseRubber - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 6 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/ammunition.yml deleted file mode 100644 index 53d2f4e1ce..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/ammunition.yml +++ /dev/null @@ -1,237 +0,0 @@ -# Empty mags -- type: entity - id: magazine_44_empty - name: ".44 magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A44 - magazine: A44 - capacity: 6 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_44 - name: ".44 magazine" - parent: magazine_44_empty - components: - - type: BallisticMagazine - fill: ammo_casing_44 - caliber: A44 - capacity: 6 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi - state: mg_ih_pst_44-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi - state: mg_ih_pst_44-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_pst_44 - steps: 2 - -- type: entity - id: magazine_44f - name: ".44 magazine (flash)" - parent: magazine_44_empty - components: - - type: BallisticMagazine - fill: ammo_casing_44_flash - caliber: A44 - capacity: 6 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi - state: mg_ih_pst_44f-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi - state: mg_ih_pst_44f-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_pst_44f - steps: 2 - -- type: entity - id: magazine_44hv - name: ".44 magazine (high velocity)" - parent: magazine_44_empty - components: - - type: BallisticMagazine - fill: ammo_casing_44_hv - caliber: A44 - capacity: 6 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi - state: mg_ih_pst_44hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi - state: mg_ih_pst_44hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_pst_44hv - steps: 2 - -- type: entity - id: magazine_44l - name: ".44 magazine (L)" - parent: magazine_44_empty - components: - - type: BallisticMagazine - fill: ammo_casing_44_l - caliber: A44 - capacity: 6 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi - state: mg_ih_pst_44l-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi - state: mg_ih_pst_44l-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_pst_44l - steps: 2 - -- type: entity - id: magazine_44p - name: ".44 magazine (practice)" - parent: magazine_44_empty - components: - - type: BallisticMagazine - fill: ammo_casing_44_p - caliber: A44 - capacity: 6 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi - state: mg_ih_pst_44p-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi - state: mg_ih_pst_44p-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_pst_44p - steps: 2 - -- type: entity - id: magazine_44r - name: ".44 magazine (rubber)" - parent: magazine_44_empty - components: - - type: BallisticMagazine - fill: ammo_casing_44_r - caliber: A44 - capacity: 6 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi - state: mg_ih_pst_44r-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi - state: mg_ih_pst_44r-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: mg_ih_pst_44r - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_44 - name: ".44 casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A44 - projectile: bullet_44 - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_44_flash - name: ".44 casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A44 - projectile: bullet_44f - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_44_hv - name: ".44 casing (high velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A44 - projectile: bullet_44hv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_44_l - name: ".44 casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A44 - projectile: bullet_44l - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_44_p - name: ".44 casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A44 - projectile: bullet_44p - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_44_r - name: ".44 casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A44 - projectile: bullet_44r - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/boxes.yml deleted file mode 100644 index e12db56a52..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/boxes.yml +++ /dev/null @@ -1,118 +0,0 @@ -# Empty boxes -- type: entity - id: box_44_empty - name: ".44 box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A44 - capacity: 20 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_44 - name: ".44 box" - parent: box_44_empty - components: - - type: AmmoBox - fill: ammo_casing_44 - caliber: A44 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.44/box44.rsi - state: box44-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.44/box44.rsi - state: box44-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box44 - steps: 2 - -- type: entity - id: box_44f - name: ".44 box (flash)" - parent: box_44_empty - components: - - type: AmmoBox - fill: ammo_casing_44_flash - caliber: A44 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi - state: box44-flash-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi - state: box44-flash-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box44-flash - steps: 2 - -- type: entity - id: box_44hv - name: ".44 box (high-velocity)" - parent: box_44_empty - components: - - type: AmmoBox - fill: ammo_casing_44_hv - caliber: A44 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi - state: box44-hv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi - state: box44-hv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box44-hv - steps: 2 - -- type: entity - id: box_44p - name: ".44 box (practice)" - parent: box_44_empty - components: - - type: AmmoBox - fill: ammo_casing_44_p - caliber: A44 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi - state: box44-practice-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi - state: box44-practice-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box44-practice - steps: 2 - -- type: entity - id: box_44r - name: ".44 box (rubber)" - parent: box_44_empty - components: - - type: AmmoBox - fill: ammo_casing_44_r - caliber: A44 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi - state: box44-rubber-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi - state: box44-rubber-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box44-rubber - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml deleted file mode 100644 index a2b77bf3e5..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_44 - name: .44 bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 45 - -- type: entity - id: bullet_44f - name: .44 bullet (flash) - parent: BulletBaseFlash - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 45 - -- type: entity - id: bullet_44hv - name: .44 bullet (high-velocity) - parent: BulletBaseHighVelocity - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 54 - -- type: entity - id: bullet_44l - name: .44 bullet (L) - parent: BulletBaseL - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 45 - -- type: entity - id: bullet_44p - name: .44 bullet (practice) - parent: BulletBasePractice - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_44r - name: .44 bullet (rubber) - parent: BulletBaseRubber - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 7 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/ammunition.yml deleted file mode 100644 index fbd7abaa24..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/ammunition.yml +++ /dev/null @@ -1,231 +0,0 @@ -# Empty mags -- type: entity - id: magazine_50_empty - name: ".50 cal magazine - empty" - parent: BaseItem - abstract: true - components: - - type: BallisticMagazine - caliber: A50 - magazine: A50 - capacity: 7 - - type: Sprite - netsync: false - -# Magazines -- type: entity - id: magazine_50 - name: ".50 cal magazine" - parent: magazine_50_empty - components: - - type: BallisticMagazine - fill: ammo_casing_50 - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.50/50ae.rsi - state: 50ae-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.50/50ae.rsi - state: 50ae-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 50ae - steps: 2 - -- type: entity - id: magazine_50f - name: ".50 cal magazine (flash)" - parent: magazine_50_empty - components: - - type: BallisticMagazine - fill: ammo_casing_50_f - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.50/50aef.rsi - state: 50aef-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.50/50aef.rsi - state: 50aef-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 50aef - steps: 2 - -- type: entity - id: magazine_50hv - name: ".50 cal magazine (high-velocity)" - parent: magazine_50_empty - components: - - type: BallisticMagazine - fill: ammo_casing_50_hv - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi - state: 50aehv-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi - state: 50aehv-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 50aehv - steps: 2 - -- type: entity - id: magazine_50l - name: ".50 cal magazine (L)" - parent: magazine_50_empty - components: - - type: BallisticMagazine - fill: ammo_casing_50_l - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.50/50ael.rsi - state: 50ael-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.50/50ael.rsi - state: 50ael-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 50ael - steps: 2 - -- type: entity - id: magazine_50p - name: ".50 cal magazine (practice)" - parent: magazine_50_empty - components: - - type: BallisticMagazine - fill: ammo_casing_50_p - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.50/50aep.rsi - state: 50aep-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.50/50aep.rsi - state: 50aep-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 50aep - steps: 2 - -- type: entity - id: magazine_50r - name: ".50 cal magazine (rubber)" - parent: magazine_50_empty - components: - - type: BallisticMagazine - fill: ammo_casing_50_r - capacity: 7 - - type: Icon - sprite: Objects/Guns/Ammunition/Magazine/.50/50aer.rsi - state: 50aer-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Magazine/.50/50aer.rsi - state: 50aer-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 50aer - steps: 2 - -# Casings - magazines above here -- type: entity - id: ammo_casing_50 - name: ".50 cal casing" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A50 - projectile: bullet_50 - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_50_f - name: ".50 cal casing (flash)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A50 - projectile: bullet_50f - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_50_hv - name: ".50 cal casing (high-velocity)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A50 - projectile: bullet_50hv - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_50_l - name: ".50 cal casing (L)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A50 - projectile: bullet_50l - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_50_p - name: ".50 cal casing (practice)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A50 - projectile: bullet_50p - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - -- type: entity - id: ammo_casing_50_r - name: ".50 cal casing (rubber)" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A50 - projectile: bullet_50r - - type: Sprite - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/Guns/Ammunition/ammo_casing.rsi - state: s-casing diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/boxes.yml deleted file mode 100644 index fa04e59ff1..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/boxes.yml +++ /dev/null @@ -1,99 +0,0 @@ -# Empty boxes -- type: entity - id: box_50_empty - name: ".50 cal box - empty" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: A50 - capacity: 20 - - type: Sprite - netsync: false - -# Ammo boxes -- type: entity - id: box_50 - name: ".50 cal box" - parent: box_50_empty - components: - - type: AmmoBox - fill: ammo_casing_50 - caliber: A50 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.50/box50.rsi - state: box50-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.50/box50.rsi - state: box50-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box50 - steps: 2 - -- type: entity - id: box_50f - name: ".50 cal box (flash)" - parent: box_50_empty - components: - - type: AmmoBox - fill: ammo_casing_50_f - caliber: A50 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi - state: box50-flash-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi - state: box50-flash-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box50-flash - steps: 2 - -# Surprise: no HV - -- type: entity - id: box_50p - name: ".50 cal box (practice)" - parent: box_50_empty - components: - - type: AmmoBox - fill: ammo_casing_50_p - caliber: A50 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi - state: box50-practice-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi - state: box50-practice-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box50-practice - steps: 2 - -- type: entity - id: box_50r - name: ".50 cal box (rubber)" - parent: box_50_empty - components: - - type: AmmoBox - fill: ammo_casing_50_r - caliber: A50 - capacity: 20 - - type: Icon - sprite: Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi - state: box50-rubber-1 - - type: Sprite - sprite: Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi - state: box50-rubber-1 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: box50-rubber - steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml deleted file mode 100644 index 4ba6b0042c..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - id: bullet_50 - name: .50 cal bullet - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 50 - -- type: entity - id: bullet_50f - name: .50 cal bullet (flash) - parent: BulletBaseFlash - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 50 - -- type: entity - id: bullet_50hv - name: .50 cal bullet (high-velocity) - parent: BulletBaseHighVelocity - abstract: true - components: - - type: Projectile - velocity: 30 - damages: - Brute: 60 - -- type: entity - id: bullet_50l - name: .50 cal bullet (L) - parent: BulletBaseL - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 50 - -- type: entity - id: bullet_50p - name: .50 cal bullet (practice) - parent: BulletBasePractice - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 0 - -- type: entity - id: bullet_50r - name: .50 cal bullet (rubber) - parent: BulletBaseRubber - abstract: true - components: - - type: Projectile - velocity: 20 - damages: - Brute: 7 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml new file mode 100644 index 0000000000..8f3b628dfb --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/boxes.yml @@ -0,0 +1,116 @@ +- type: entity + id: BoxSRifleBase + name: "ammunition box (.20 rifle)" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: SRifle + capacity: 30 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Boxes +- type: entity + id: BoxSRifleBigBox + name: "ammunition box (.20 rifle)" + parent: BoxSRifleBase + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeSRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi + +- type: entity + id: BoxSRifleBigBoxRubber + name: "ammunition box (.20 rifle rubber)" + parent: BoxSRifleBase + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeSRifleRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi + +- type: entity + id: BoxSRifleBox + name: "ammunition box (.20 rifle)" + parent: BoxSRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeSRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi + +- type: entity + id: BoxSRifleBoxFlash + name: "ammunition box (.20 rifle flash)" + parent: BoxSRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeSRifleFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi + +- type: entity + id: BoxSRifleBoxHV + name: "ammunition box (.20 rifle high-velocity)" + parent: BoxSRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeSRifleHV + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi + +- type: entity + id: BoxSRifleBoxPractice + name: "ammunition box (.20 rifle practice)" + parent: BoxSRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeSRiflePractice + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi + +- type: entity + id: BoxSRifleBoxRubber + name: "ammunition box (.20 rifle rubber)" + parent: BoxSRifleBase + components: + - type: AmmoBox + capacity: 60 + fillPrototype: CartridgeSRifleRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml new file mode 100644 index 0000000000..b34c8510ed --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/cartridges.yml @@ -0,0 +1,58 @@ +- type: entity + id: CartridgeSRifleBase + name: cartridge (.20 rifle) + parent: BaseItem + abstract: true + components: + - type: Ammo + caliber: SRifle + - type: Sprite + netsync: false + directional: false + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/ammo_casing.rsi + state: s-casing + +- type: entity + id: CartridgeSRifle + name: cartridge (.20 rifle) + parent: CartridgeSRifleBase + components: + - type: Ammo + projectile: BulletSRifle + +- type: entity + id: CartridgeSRifleFlash + name: cartridge (.20 rifle flash) + parent: CartridgeSRifleBase + components: + - type: Ammo + projectile: BulletSRifleFlash + +- type: entity + id: CartridgeSRifleHV + name: cartridge (.20 rifle high-velocity) + parent: CartridgeSRifleBase + components: + - type: Ammo + projectile: BulletSRifleHV + ammoVelocity: 30 + +- type: entity + id: CartridgeSRiflePractice + name: cartridge (.20 rifle practice) + parent: CartridgeSRifleBase + components: + - type: Ammo + projectile: BulletSRiflePractice + +- type: entity + id: CartridgeSRifleRubber + name: cartridge (.20 rifle rubber) + parent: CartridgeSRifleBase + components: + - type: Ammo + projectile: BulletSRifleRubber diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml new file mode 100644 index 0000000000..a80afe0f5f --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/magazines.yml @@ -0,0 +1,87 @@ +# Empty mags +- type: entity + id: MagazineSRifleBase + name: "magazine (.20 rifle)" + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: SRifle + magazineType: Rifle + capacity: 25 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +# Magazines +- type: entity + id: MagazineSRifle + name: "magazine (.20 rifle)" + parent: MagazineSRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeSRifle + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi + +- type: entity + id: MagazineSRifleFlash + name: "magazine (.20 rifle flash)" + parent: MagazineSRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeSRifleFlash + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi + +- type: entity + id: MagazineSRifleHV + name: "magazine (.20 rifle high-velocity)" + parent: MagazineSRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeSRifleHV + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi + +- type: entity + id: MagazineSRiflePractice + name: "magazine (.20 rifle practice)" + parent: MagazineSRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeSRiflePractice + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi + +- type: entity + id: MagazineSRifleRubber + name: "magazine (.20 rifle rubber)" + parent: MagazineSRifleBase + components: + - type: RangedMagazine + fillPrototype: CartridgeSRifleRubber + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/projectiles.yml new file mode 100644 index 0000000000..a5f687aad9 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/SRifle/projectiles.yml @@ -0,0 +1,49 @@ +- type: entity + id: BulletSRifle + name: bullet (0.20 rifle) + parent: BulletBase + abstract: true + components: + - type: Projectile + damages: + Brute: 25 + +- type: entity + id: BulletSRifleFlash + name: bullet (0.20 rifle flash) + parent: BulletBaseFlash + abstract: true + components: + - type: Projectile + damages: + Brute: 25 + +- type: entity + id: BulletSRifleHV + name: bullet (0.20 rifle high-velocity) + parent: BulletBaseHV + abstract: true + components: + - type: Projectile + damages: + Brute: 30 + +- type: entity + id: BulletSRiflePractice + name: bullet (0.20 rifle practice) + parent: BulletBasePractice + abstract: true + components: + - type: Projectile + damages: + Brute: 2 + +- type: entity + id: BulletSRifleRubber + name: bullet (0.20 rifle rubber) + parent: BulletBaseRubber + abstract: true + components: + - type: Projectile + damages: + Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml new file mode 100644 index 0000000000..da90fe12bc --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/cartridges.yml @@ -0,0 +1,104 @@ +- type: entity + id: ShellShotgunBase + name: shell (.50) + parent: BaseItem + abstract: true + components: + - type: Ammo + caliber: Shotgun + ammoSpread: 40 + soundCollectionEject: ShellEject + - type: Sprite + netsync: false + directional: false + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + drawdepth: FloorObjects + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell.rsi + state: base + - type: Appearance + visuals: + - type: SpentAmmoVisualizer2D + +- type: entity + id: ShellShotgunBeanbag + name: shell (.50 beanbag) + parent: ShellShotgunBase + components: + - type: Sprite + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi + - type: Ammo + ammoSpread: 0 + projectile: PelletShotgunBeanbag + projectilesFired: 1 + +- type: entity + id: ShellShotgunSlug + name: shell (.50 slug) + parent: ShellShotgunBase + components: + - type: Sprite + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi + - type: Ammo + projectile: PelletShotgunSlug + projectilesFired: 4 + ammoSpread: 10 + +- type: entity + id: ShellShotgun + name: shell (.50) + parent: ShellShotgunBase + components: + - type: Sprite + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell.rsi + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell.rsi + - type: Ammo + projectile: PelletShotgun + projectilesFired: 6 + +- type: entity + id: ShellShotgunFlash + name: shell (.50 flash) + parent: ShellShotgunBase + components: + - type: Sprite + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi + - type: Ammo + projectile: PelletShotgunFlash + projectilesFired: 6 + +- type: entity + id: ShellShotgunIncendiary + name: shell (.50 incendiary) + parent: ShellShotgunBase + components: + - type: Sprite + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi + - type: Ammo + projectile: PelletShotgun + projectilesFired: 6 + +- type: entity + id: ShellShotgunPractice + name: shell (.50 practice) + parent: ShellShotgunBase + components: + - type: Sprite + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi + - type: Icon + sprite: Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi + - type: Ammo + projectile: PelletShotgun + projectilesFired: 6 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml new file mode 100644 index 0000000000..b5dca3bdbf --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/magazines.yml @@ -0,0 +1,61 @@ +- type: entity + id: MagazineShotgunBase + name: ammo drum (.50 shells) + parent: BaseItem + abstract: true + components: + - type: RangedMagazine + caliber: Shotgun + magazineType: Rifle + capacity: 8 + - type: Icon + state: icon + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 2 + zeroVisible: false + +- type: entity + id: MagazineShotgun + name: ammo drum (.50 pellet) + parent: MagazineShotgunBase + components: + - type: RangedMagazine + fillPrototype: ShellShotgun + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi + +- type: entity + id: MagazineShotgunBeanbag + name: ammo drum (.50 beanbags) + parent: MagazineShotgunBase + components: + - type: RangedMagazine + fillPrototype: ShellShotgunBeanbag + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi + +- type: entity + id: MagazineShotgunSlug + name: ammo drum (.50 slug) + parent: MagazineShotgunBase + components: + - type: RangedMagazine + fillPrototype: ShellShotgunSlug + - type: Icon + sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi + - type: Sprite + sprite: Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml new file mode 100644 index 0000000000..5508caced2 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Shotgun/projectiles.yml @@ -0,0 +1,78 @@ +- type: entity + id: PelletShotgunSlug + name: pellet (.50 slug) + abstract: true + parent: BulletBase + components: + - type: Sprite + sprite: Objects/Guns/Projectiles/slug.rsi + state: base + - type: Projectile + damages: + Brute: 13 + +- type: entity + id: PelletShotgunBeanbag + name: beanbag (.50) + abstract: true + parent: BulletBase + components: + - type: Sprite + sprite: Objects/Guns/Projectiles/buckshot.rsi + state: base + - type: Projectile + damages: + Brute: 10 + - type: StunnableProjectile + +- type: entity + id: PelletShotgun + name: pellet (.50) + abstract: true + parent: BulletBase + components: + - type: Sprite + sprite: Objects/Guns/Projectiles/buckshot.rsi + state: base + - type: Projectile + damages: + Brute: 13 + +- type: entity + id: PelletShotgunFlash + name: pellet (.50 flash) + abstract: true + parent: BulletBaseFlash + components: + - type: Sprite + sprite: Objects/Guns/Projectiles/buckshot.rsi + state: base + - type: Projectile + damages: + Brute: 13 + +- type: entity + id: PelletShotgunIncendiary + name: pellet (.50 incendiary) + abstract: true + parent: BulletBase + components: + - type: Sprite + sprite: Objects/Guns/Projectiles/buckshot.rsi + state: base + - type: Projectile + damages: + Brute: 13 + +- type: entity + id: PelletShotgunPractice + name: pellet (.50 practice) + abstract: true + parent: BulletBasePractice + components: + - type: Sprite + sprite: Objects/Guns/Projectiles/buckshot.rsi + state: base + - type: Projectile + damages: + Brute: 1 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml new file mode 100644 index 0000000000..4351d8bcec --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/sound_collections.yml @@ -0,0 +1,11 @@ +- type: soundCollection + id: CasingEject + files: + - "/Audio/Guns/Casings/casing_fall_1.ogg" + - "/Audio/Guns/Casings/casing_fall_2.ogg" + - "/Audio/Guns/Casings/casing_fall_3.ogg" + +- type: soundCollection + id: ShellEject + files: + - "/Audio/Guns/Casings/shotgun_fall.ogg" \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml new file mode 100644 index 0000000000..91dbc8de10 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml @@ -0,0 +1,165 @@ +- type: entity + name: retro laser gun + parent: BaseItem + id: LaserGun + description: A weapon using light amplified by the stimulated emission of radiation. Ancient inefficient model. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Battery/laser_retro.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Icon + sprite: Objects/Guns/Battery/laser_retro.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Guns/Battery/laser_retro.rsi + - type: RangedWeapon + - type: BatteryBarrel + minAngle: 10 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 45 + currentSelector: Single + allSelectors: + - Single + fireRate: 2 + powerCellPrototype: PowerCellSmallStandard + ammoPrototype: RedLaser + soundGunshot: /Audio/Guns/Gunshots/laser.ogg + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 5 + zeroVisible: true + +- type: entity + name: laser cannon + parent: BaseItem + id: LaserCannon + description: With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes! + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Battery/laser_cannon.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Icon + sprite: Objects/Guns/Battery/laser_cannon.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Guns/Battery/laser_cannon.rsi + - type: RangedWeapon + - type: BatteryBarrel + currentSelector: Single + allSelectors: + - Single + fireRate: 2 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 45 + powerCellPrototype: PowerCellSmallSuper + ammoPrototype: RedHeavyLaser + soundGunshot: /Audio/Guns/Gunshots/laser_cannon.ogg + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 5 + zeroVisible: false + +- type: entity + name: x-ray cannon + parent: BaseItem + id: XrayCannon + description: Blah blah blah + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Battery/xray.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Icon + sprite: Objects/Guns/Battery/xray.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Guns/Battery/xray.rsi + - type: RangedWeapon + - type: BatteryBarrel + currentSelector: Single + allSelectors: + - Single + fireRate: 2 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 45 + powerCellPrototype: PowerCellSmallSuper + base_fire_cost: 600 + ammoPrototype: XrayLaser + soundGunshot: /Audio/Guns/Gunshots/laser3.ogg + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 5 + zeroVisible: true + +- type: entity + name: taser + parent: BaseItem + id: TaserGun + description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Battery/taser.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Icon + sprite: Objects/Guns/Battery/taser.rsi + state: icon + - type: Item + Size: 24 + sprite: Objects/Guns/Battery/taser.rsi + prefix: icon + - type: RangedWeapon + - type: BatteryBarrel + currentSelector: Single + allSelectors: + - Single + fireRate: 2 + minAngle: 5 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 15 + powerCellPrototype: PowerCellSmallStandard + ammoPrototype: BulletTaser + soundGunshot: /Audio/Guns/Gunshots/taser.ogg + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 5 + zeroVisible: true diff --git a/Resources/Prototypes/Entities/Weapons/Energy/taser.yml b/Resources/Prototypes/Entities/Weapons/Energy/taser.yml deleted file mode 100644 index 5dc5e865c3..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Energy/taser.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - id: Taser - parent: BaseItem - name: taser - description: Literally just a dummy for a screenshot at this point, sorry! - components: - - type: Sprite - sprite: "Objects/Guns/Energy/taser.rsi" - state: taser - - - type: Icon - sprite: "Objects/Guns/Energy/taser.rsi" - state: taser - - - type: Item - sprite: "Objects/Guns/Energy/taser.rsi" - HeldPrefix: taser2 - diff --git a/Resources/Prototypes/Entities/Items/explosives.yml b/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml similarity index 69% rename from Resources/Prototypes/Entities/Items/explosives.yml rename to Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml index 8d41acd272..8949ecc128 100644 --- a/Resources/Prototypes/Entities/Items/explosives.yml +++ b/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml @@ -9,34 +9,55 @@ layers: - state: icon map: ["enum.TriggerVisualLayers.Base"] - - type: Icon sprite: Objects/Grenades/grenade.rsi state: icon - - type: Item Size: 5 - - type: OnUseTimerTrigger delay: 3.5 - - type: Explosive devastationRange: 1 heavyImpactRange: 3 lightImpactRange: 5 flashRange: 7 - - type: Damageable - type: Destructible thresholdvalue: 10 - - type: Appearance visuals: - type: TimerTriggerVisualizer2D countdown_sound: /Audio/effects/countdown.ogg - type: entity - name: syndicate minibomb + name: flashbang + description: Eeeeeeeeeeeeeeeeeeeeee + parent: BaseItem + id: GrenadeFlashBang + components: + - type: Sprite + sprite: Objects/Grenades/flashbang.rsi + layers: + - state: icon + map: ["enum.TriggerVisualLayers.Base"] + - type: Icon + sprite: Objects/Grenades/flashbang.rsi + state: icon + - type: Item + Size: 5 + - type: OnUseTimerTrigger + delay: 3.5 + - type: FlashExplosive + - type: Damageable + - type: Destructible + thresholdvalue: 10 + - type: Appearance + visuals: + - type: TimerTriggerVisualizer2D + countdown_sound: /Audio/effects/countdown.ogg + +- type: entity + name: Syndicate minibomb description: A syndicate manufactured explosive used to sow destruction and chaos. parent: BaseItem id: SyndieMiniBomb @@ -46,27 +67,21 @@ layers: - state: icon map: ["enum.TriggerVisualLayers.Base"] - - type: Icon sprite: Objects/Grenades/syndgrenade.rsi state: icon - - type: Item Size: 5 - - type: OnUseTimerTrigger delay: 5 - - type: Explosive devastationRange: 3 heavyImpactRange: 5 lightImpactRange: 7 flashRange: 10 - - type: Damageable - type: Destructible thresholdvalue: 10 - - type: Appearance visuals: - type: TimerTriggerVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml index 3ab9f26679..e460c4d2e6 100644 --- a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml @@ -1,85 +1,105 @@ - type: entity - name: baselmg + name: BaseLMG parent: BaseItem - id: LmgBase + id: LMGBase description: A rooty tooty point and shooty. abstract: true components: - - type: LoopingSound - - type: RangedWeapon - spreadstddev: 30 - automatic: true - firerate: 10 - - type: BallisticMagazineWeapon - caliber: A762mm - magazines: - - A762mm - default_magazine: magazine_pk - auto_eject_magazine: false - sound_auto_eject: /Audio/Guns/EmptyAlarm/lmg_empty_alarm.ogg - sound_magazine_in: /Audio/Guns/MagIn/lmg_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/smg_magout.ogg - sound_empty: /Audio/Guns/Empty/lmg_empty.ogg - sound_gunshot: /Audio/Guns/Gunshots/lmg.ogg - -- type: entity - name: L6 - parent: LmgBase - id: LmgL6 - description: A rooty tooty point and shooty. - components: - type: Sprite netsync: false - sprite: Objects/Guns/LMGs/l6.rsi - state: l6-4 + - type: Icon + state: icon + - type: Item + size: 24 + state: icon + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Automatic + caliber: LRifle + magazineTypes: + - Box + fireRate: 8 + minAngle: 10 + maxAngle: 45 + angleIncrease: 10 + angleDecay: 60 + magNeedsOpenBolt: true + soundGunshot: /Audio/Guns/Gunshots/lmg.ogg + soundEmpty: /Audio/Guns/Empty/lmg_empty.ogg + soundRack: /Audio/Guns/Cock/lmg_cock.ogg + soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg + soundAutoEject: /Audio/Guns/EmptyAlarm/lmg_empty_alarm.ogg + soundMagInsert: /Audio/Guns/MagIn/lmg_magin.ogg + soundMagEject: /Audio/Guns/MagOut/lmg_magout.ogg + +- type: entity + name: L6 SAW + id: LMGL6 + parent: LMGBase + description: A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. This one is unmarked. + components: + - type: Sprite + sprite: Objects/Guns/Lmgs/l6.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-3 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon sprite: Objects/Guns/LMGs/l6.rsi - state: l6-4 - - type: RangedWeapon - spreadstddev: 30 - automatic: true - firerate: 10 - - type: BallisticMagazineWeapon - caliber: A762mm - magazines: - - A762mm - default_magazine: magazine_a762 - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: l6 - steps: 5 - type: Item Size: 24 sprite: Objects/Guns/LMGs/l6.rsi - -- type: entity - name: PK - parent: LmgBase - id: LmgPk - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/LMGs/pk.rsi - state: pk-4 - - type: Icon - sprite: Objects/Guns/LMGs/pk.rsi - state: pk-4 - type: RangedWeapon - spreadstddev: 10 - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A762mm - magazines: - - A762mm - default_magazine: magazine_pk + - type: MagazineBarrel + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 60 - type: Appearance visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: pk - steps: 5 + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 4 + zeroVisible: true + +- type: entity + name: pulemyot kalashnikova + id: LMGPK + parent: LMGBase + description: Kalashnikov's Machinegun, a well preserved and maintained antique weapon of war. + components: + - type: Sprite + sprite: Objects/Guns/Lmgs/pk.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-5 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + sprite: Objects/Guns/LMGs/pk.rsi - type: Item Size: 24 sprite: Objects/Guns/LMGs/pk.rsi + - type: RangedWeapon + - type: MagazineBarrel + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 60 + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 6 + zeroVisible: true diff --git a/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml deleted file mode 100644 index 953737b96c..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml +++ /dev/null @@ -1,59 +0,0 @@ -- type: entity - name: retro laser gun - parent: BaseItem - id: LaserGun - description: A weapon using light amplified by the stimulated emission of radiation. Ancient inefficient model. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Laser/laser_retro.rsi - state: laser_retro_100 - - type: Icon - sprite: Objects/Guns/Laser/laser_retro.rsi - state: laser_retro_100 - - type: RangedWeapon - - type: HitscanWeapon - damage: 30 - fireSprite: "Objects/Projectiles/laser.png" - fireSound: "/Audio/Guns/Gunshots/laser.ogg" - lowerDischargeLimit: 10 - - type: HitscanWeaponCapacitor - capacity: 1200 - - type: Item - Size: 24 - sprite: Objects/Guns/Laser/laser_retro.rsi - prefix: laser_retro_100 - - type: Appearance - visuals: - - type: HitscanWeaponVisualizer2D - prefix: laser_retro - - type: LoopingSound - -- type: entity - name: laser cannon - parent: LaserGun - id: LaserCannon - description: With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes! - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Laser/laser_cannon.rsi - state: laser_cannon_100 - - type: Icon - sprite: Objects/Guns/Laser/laser_cannon.rsi - state: laser_cannon_100 - - type: HitscanWeapon - damage: 90 - fireSprite: "Objects/Projectiles/heavylaser.png" - fireSound: "/Audio/Guns/Gunshots/laser_cannon.ogg" - lowerDischargeLimit: 10 - - type: HitscanWeaponCapacitor - capacity: 2400 - - type: Item - Size: 32 - sprite: Objects/Guns/Laser/laser_cannon.rsi - prefix: laser_cannon_100 - - type: Appearance - visuals: - - type: HitscanWeaponVisualizer2D - prefix: laser_cannon diff --git a/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml b/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml new file mode 100644 index 0000000000..a7544c1923 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml @@ -0,0 +1,83 @@ +- type: entity + name: Launcher Base + parent: BaseItem + id: LauncherBase + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sprite + netsync: false + - type: Icon + state: icon + - type: Item + size: 24 + state: icon + +- type: entity + name: china lake + parent: LauncherBase + id: LauncherChinaLake + description: This centuries-old design was recently rediscovered and adapted for use in modern battlefields. Working similar to a pump-action combat shotgun, its light weight and robust design quickly made it a popular weapon. It uses specialised grenade shells. + components: + - type: Sprite + sprite: Objects/Guns/Launchers/china_lake.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - type: Icon + sprite: Objects/Guns/Launchers/china_lake.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/Launchers/china_lake.rsi + - type: RangedWeapon + - type: BoltActionBarrel + caliber: Grenade + currentSelector: Single + allSelectors: + - Single + fireRate: 1 + capacity: 3 + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundGunshot: /Audio/Guns/Gunshots/grenade_launcher.ogg + soundInsert: /Audio/Guns/MagIn/batrifle_magin.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + +- type: entity + name: RPG-7 + parent: LauncherBase + id: LauncherRocket + description: A modified ancient rocket-propelled grenade launcher, this design is centuries old, but well preserved. + components: + - type: Sprite + sprite: Objects/Guns/Launchers/rocket.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + sprite: Objects/Guns/Launchers/rocket.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/Launchers/rocket.rsi + - type: RangedWeapon + - type: RevolverBarrel + caliber: Rocket + currentSelector: Single + allSelectors: + - Single + fireRate: 0.5 + capacity: 1 + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundGunshot: /Audio/Guns/Gunshots/rpgfire.ogg + soundInsert: /Audio/Guns/MagIn/batrifle_magin.ogg + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true diff --git a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml index 99ba8a5416..fba5f1f820 100644 --- a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml @@ -1,586 +1,396 @@ - type: entity - name: basepistol + name: BasePistol parent: BaseItem id: PistolBase description: A rooty tooty point and shooty. abstract: true components: - - type: LoopingSound - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - default_magazine: magazine_9mm - auto_eject_magazine: false - sound_auto_eject: /Audio/Guns/MagOut/pistol_magout.ogg - sound_magazine_in: /Audio/Guns/MagIn/pistol_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/pistol_magout.ogg - sound_empty: /Audio/Guns/Empty/empty.ogg - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + state: icon + - type: Item + size: 24 + state: icon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + currentSelector: Single + allSelectors: + - Single + fireRate: 8 + minAngle: 10 + maxAngle: 60 + angleIncrease: 10 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/pistol.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundRack: /Audio/Guns/Cock/pistol_cock.ogg + soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Guns/MagIn/pistol_magin.ogg + soundMagEject: /Audio/Guns/MagOut/pistol_magout.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true - type: entity - name: Clarissa + name: clarissa parent: PistolBase id: PistolClarissa - description: A rooty tooty point and shooty. + description: components: - type: Sprite - netsync: false sprite: Objects/Guns/Pistols/clarissa.rsi - state: clarissa-0 - type: Icon sprite: Objects/Guns/Pistols/clarissa.rsi - state: clarissa-0 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - default_magazine: magazine_9mm - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: clarissa - steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Pistols/clarissa.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + - HCPistol + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 - type: entity - name: clarissa (silenced) + name: colt M1911 parent: PistolBase - id: PistolClarissaS - description: A rooty tooty point and shooty. + id: PistolColt + description: components: - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/clarissa_s.rsi - state: clarissa_s-0 + sprite: Objects/Guns/Pistols/colt.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Pistols/clarissa_s.rsi - state: clarissa_s-0 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - default_magazine: magazine_9mm - sound_gunshot: /Audio/Guns/Gunshots/silenced.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: clarissa_s - steps: 1 + sprite: Objects/Guns/Pistols/colt.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/clarissa_s.rsi - -- type: entity - name: Deagle - parent: PistolBase - id: PistolDeagle - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/deagle.rsi - state: deagle-0 - - type: Icon - sprite: Objects/Guns/Pistols/deagle.rsi - state: deagle-0 + sprite: Objects/Guns/Pistols/colt.rsi - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A50 - magazines: - - A50 - default_magazine: magazine_50 - sound_auto_eject: /Audio/Guns/MagOut/hpistol_magout.ogg - sound_magazine_in: /Audio/Guns/MagIn/hpistol_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/hpistol_magout.ogg - sound_empty: /Audio/Guns/Empty/empty.ogg - sound_gunshot: /Audio/Guns/Gunshots/hpistol.ogg + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 - type: Appearance visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: deagle - steps: 1 - - type: Item - Size: 24 - sprite: Objects/Guns/Pistols/deagle.rsi - -- type: entity - name: Deckard - parent: PistolBase - id: PistolDeckard - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/deckard.rsi - state: deckard-2 - - type: Icon - sprite: Objects/Guns/Pistols/deckard.rsi - state: deckard-2 - - type: LoopingSound - - type: RangedWeapon - spreadstddev: 2 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A44 - magazines: - - A44 - default_magazine: magazine_44 - sound_gunshot: /Audio/Guns/Gunshots/revolver.ogg - sound_magazine_in: /Audio/Guns/MagIn/revolver_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/revolver_magout.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: deckard - steps: 3 - - type: Item - Size: 24 - sprite: Objects/Guns/Pistols/deckard.rsi + - type: BarrelBoltVisualizer2D - type: entity name: giskard parent: PistolBase id: PistolGiskard - description: A rooty tooty point and shooty. + description: A popular "Frozen Star" brand pocket pistol chambered for the ubiquitous .35 auto round. Uses standard capacity magazines. components: - type: Sprite - netsync: false sprite: Objects/Guns/Pistols/giskard.rsi - state: giskard-1 - type: Icon sprite: Objects/Guns/Pistols/giskard.rsi - state: giskard-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A32 - magazines: - - A32 - default_magazine: magazine_32 - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: giskard - steps: 2 - type: Item Size: 24 sprite: Objects/Guns/Pistols/giskard.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 - type: entity - name: giskard (silenced) - parent: PistolBase - id: PistolGiskardS - description: A rooty tooty point and shooty. + name: handmade pistol + parent: BaseItem + id: PistolHMPistol + description: Looks unreliable. components: - type: Sprite netsync: false - sprite: Objects/Guns/Pistols/giskard_s.rsi - state: giskard_s-1 + sprite: Objects/Guns/Pistols/hm_pistol.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon - sprite: Objects/Guns/Pistols/giskard_s.rsi - state: giskard_s-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A32 - magazines: - - A32 - default_magazine: magazine_32 - sound_gunshot: /Audio/Guns/Gunshots/silenced.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: giskard_s - steps: 2 + sprite: Objects/Guns/Pistols/hm_pistol.rsi + state: icon - type: Item Size: 24 - sprite: Objects/Guns/Pistols/giskard_s.rsi - -- type: entity - name: gyro pistol - parent: PistolBase - id: PistolGyro - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/gyropistol.rsi - state: gyropistol-0 - - type: Icon - sprite: Objects/Guns/Pistols/gyropistol.rsi - state: gyropistol-0 + sprite: Objects/Guns/Pistols/hm_pistol.rsi - type: RangedWeapon - spreadstddev: 0.5 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A20mm - magazines: - - A20mm - default_magazine: magazine_20mm - auto_eject_magazine: true - sound_auto_eject: /Audio/Guns/MagOut/hpistol_magout.ogg - sound_magazine_in: /Audio/Guns/MagIn/hpistol_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/hpistol_magout.ogg - sound_empty: /Audio/Guns/Empty/empty.ogg - sound_gunshot: /Audio/Guns/Gunshots/hpistol.ogg + - type: BoltActionBarrel + caliber: Pistol + currentSelector: Single + allSelectors: + - Single + capacity: 1 + fireRate: 8 + minAngle: 10 + maxAngle: 60 + angleIncrease: 10 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/pistol.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundRack: /Audio/Guns/Cock/pistol_cock.ogg + soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Guns/MagIn/pistol_magin.ogg + soundMagEject: /Audio/Guns/MagOut/pistol_magout.ogg - type: Appearance visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: gyropistol - steps: 1 - - type: Item - Size: 24 - sprite: Objects/Guns/Pistols/gyropistol.rsi - -- type: entity - name: IH machine pistol - parent: PistolBase - id: PistolIhmp - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/ih_mp.rsi - state: ih_mp-1 - - type: Icon - sprite: Objects/Guns/Pistols/ih_mp.rsi - state: ih_mp-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - - A9mmSMG - default_magazine: magazine_9mm_smg - auto_eject_magazine: true - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: ih_mp - steps: 2 - - type: Item - Size: 24 - sprite: Objects/Guns/Pistols/ih_mp.rsi - -- type: entity - name: IH machine pistol (silenced) - parent: PistolBase - id: PistolIhmpS - description: Pewsh pewsh - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/ih_mp_s.rsi - state: ih_mp_s-1 - - type: Icon - sprite: Objects/Guns/Pistols/ih_mp_s.rsi - state: ih_mp_s-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - - A9mmSMG - default_magazine: magazine_9mm_smg - auto_eject_magazine: true - sound_gunshot: /Audio/Guns/Gunshots/silenced.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: ih_mp_s - steps: 2 - - type: Item - Size: 24 - sprite: Objects/Guns/Pistols/ih_mp_s.rsi - -- type: entity - name: IH sidearm - parent: PistolBase - id: PistolIhSidearm - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/ih_sidearm.rsi - state: ih_sidearm-1 - - type: Icon - sprite: Objects/Guns/Pistols/ih_sidearm.rsi - state: ih_sidearm-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - default_magazine: magazine_9mm - auto_eject_magazine: true - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: ih_sidearm - steps: 2 - - type: Item - Size: 24 - sprite: Objects/Guns/Pistols/ih_sidearm.rsi - -- type: entity - name: IH sidearm (silenced) - parent: PistolBase - id: PistolIhSidearmS - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/ih_sidearm_s.rsi - state: ih_sidearm_s-1 - - type: Icon - sprite: Objects/Guns/Pistols/ih_sidearm_s.rsi - state: ih_sidearm_s-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - default_magazine: magazine_9mm - auto_eject_magazine: true - sound_gunshot: /Audio/Guns/Gunshots/silenced.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: ih_sidearm_s - steps: 2 - - type: Item - Size: 24 - sprite: Objects/Guns/Pistols/ih_sidearm_s.rsi + - type: BarrelBoltVisualizer2D - type: entity name: lamia parent: PistolBase id: PistolLamia - description: A rooty tooty point and shooty. + description: A heavy pistol of Ironhammer enforcers. components: - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/lamia.rsi - state: lamia-1 + sprite: Objects/Guns/Pistols/gyro_pistol.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Pistols/lamia.rsi - state: lamia-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A44 - magazines: - - A44 - default_magazine: magazine_44 - auto_eject_magazine: true - sound_auto_eject: /Audio/Guns/MagOut/hpistol_magout.ogg - sound_magazine_in: /Audio/Guns/MagIn/hpistol_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/hpistol_magout.ogg - sound_empty: /Audio/Guns/Empty/empty.ogg - sound_gunshot: /Audio/Guns/Gunshots/hpistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: lamia - steps: 2 + sprite: Objects/Guns/Pistols/gyro_pistol.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/lamia.rsi + sprite: Objects/Guns/Pistols/gyro_pistol.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Magnum + magazineTypes: + - Pistol + autoEjectMag: true + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/hpistol.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundRack: /Audio/Guns/Cock/hpistol_cock.ogg + soundMagInsert: /Audio/Guns/MagIn/hpistol_magin.ogg + soundMagEject: /Audio/Guns/MagOut/hpistol_magout.ogg + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true - type: entity - name: makarov + name: mandella parent: PistolBase - id: PistolMakarov - description: A rooty tooty point and shooty. + id: PistolMandella + description: A rugged, robust operator handgun with inbuilt silencer. Chambered in caseless rifle ammunition, this time-tested handgun is your absolute choice if you need to take someone down silently, as it's deadly, produces no sound, and leaves no trace. components: - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/makarov.rsi - state: makarov-0 + sprite: Objects/Guns/Pistols/mandella.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Pistols/makarov.rsi - state: makarov-0 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - default_magazine: magazine_9mm - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: makarov - steps: 1 + sprite: Objects/Guns/Pistols/mandella.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/makarov.rsi - -- type: entity - name: makarov (silenced) - parent: PistolBase - id: PistolMakarovS - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/makarov_s.rsi - state: makarov_s-0 - - type: Icon - sprite: Objects/Guns/Pistols/makarov_s.rsi - state: makarov_s-0 + sprite: Objects/Guns/Pistols/mandella.rsi - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mm - default_magazine: magazine_9mm - sound_gunshot: /Audio/Guns/Gunshots/silenced.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: makarov_s - steps: 1 - - type: Item - Size: 24 - sprite: Objects/Guns/Pistols/makarov_s.rsi + - type: MagazineBarrel + caliber: ClRifle + magazineTypes: + - Pistol + autoEjectMag: true + canMuzzleFlash: false # Dat in-built suppressor + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/silenced.ogg - type: entity name: mk 58 parent: PistolBase id: PistolMk58 - description: A rooty tooty point and shooty. + description: The NT Mk58 is a cheap, ubiquitous sidearm, that was produced by a NanoTrasen subsidiary. components: - type: Sprite - netsync: false sprite: Objects/Guns/Pistols/mk58.rsi - state: mk58-1 + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon sprite: Objects/Guns/Pistols/mk58.rsi - state: mk58-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A45mm - magazines: - - A45mm - default_magazine: magazine_45mm - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: mk58 - steps: 2 - type: Item Size: 24 sprite: Objects/Guns/Pistols/mk58.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D - type: entity name: mk 58 (wood) parent: PistolBase - id: PistolMk58W - description: A rooty tooty point and shooty. + id: PistolMk58Wood + description: The NT Mk58 is a cheap, ubiquitous sidearm, that was produced by a NanoTrasen subsidiary. components: - type: Sprite - netsync: false sprite: Objects/Guns/Pistols/mk58_wood.rsi - state: mk58_wood-1 + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] - type: Icon sprite: Objects/Guns/Pistols/mk58_wood.rsi - state: mk58_wood-1 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A45mm - magazines: - - A45mm - default_magazine: magazine_45mm - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: mk58_wood - steps: 2 - type: Item Size: 24 sprite: Objects/Guns/Pistols/mk58_wood.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D - type: entity - name: olivaw civil + name: molly parent: PistolBase - id: PistolOlivawCivil - description: A rooty tooty point and shooty. + id: PistolMolly + description: An experimental fully automatic pistol, designed as a middle ground between SMGs and Pistols. Primarily employed in CQC scenarios or as a civilian self defence tool. Takes both highcap pistol and smg mags. components: - type: Sprite - netsync: false - sprite: Objects/Guns/Pistols/olivawcivil.rsi - state: olivawcivil-0 + sprite: Objects/Guns/Pistols/molly.rsi - type: Icon - sprite: Objects/Guns/Pistols/olivawcivil.rsi - state: olivawcivil-0 - - type: RangedWeapon - spreadstddev: 3 - automatic: false - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A32 - magazines: - - A32 - default_magazine: magazine_32 - sound_gunshot: /Audio/Guns/Gunshots/pistol.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: olivawcivil - steps: 1 + sprite: Objects/Guns/Pistols/molly.rsi - type: Item Size: 24 - sprite: Objects/Guns/Pistols/olivawcivil.rsi + sprite: Objects/Guns/Pistols/molly.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + currentSelector: Automatic + allSelectors: + - Automatic + magazineTypes: + - HCPistol + - Smg + autoEjectMag: true + fireRate: 6 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 + +- type: entity + name: olivaw + parent: PistolBase + id: PistolOlivaw + description: A popular "Frozen Star" machine pistol. This one has a two-round burst-fire mode and is chambered for .35 auto. It can use normal and high capacity magazines. + components: + - type: Sprite + sprite: Objects/Guns/Pistols/olivaw_civil.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - type: Icon + sprite: Objects/Guns/Pistols/olivaw_civil.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/Pistols/olivaw_civil.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + - HCPistol + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + +- type: entity + name: paco + parent: PistolBase + id: PistolPaco + description: A modern and reliable sidearm for the soldier in the field. Commonly issued as a sidearm to Ironhammer Operatives. + components: + - type: Sprite + sprite: Objects/Guns/Pistols/paco.rsi + - type: Icon + sprite: Objects/Guns/Pistols/paco.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/Pistols/paco.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + autoEjectMag: true + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 60 diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml new file mode 100644 index 0000000000..4e810b071e --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/hitscan.yml @@ -0,0 +1,32 @@ +- type: entity + name: red laser + id: RedLaser + abstract: true + components: + - type: Hitscan + spriteName: Objects/Guns/Projectiles/laser.png + muzzleFlash: Objects/Guns/Projectiles/laser_muzzle.png + impactFlash: Objects/Guns/Projectiles/laser_impact.png + damage: 10 + +- type: entity + name: red heavy laser + id: RedHeavyLaser + abstract: true + components: + - type: Hitscan + spriteName: Objects/Guns/Projectiles/heavy_laser.png + muzzleFlash: Objects/Guns/Projectiles/heavy_laser_muzzle.png + impactFlash: Objects/Guns/Projectiles/heavy_laser_impact.png + damage: 30 + +- type: entity + name: x-ray laser + id: XrayLaser + abstract: true + components: + - type: Hitscan + spriteName: Objects/Guns/Projectiles/xray.png + muzzleFlash: Objects/Guns/Projectiles/xray_muzzle.png + impactFlash: Objects/Guns/Projectiles/xray_impact.png + damage: 60 diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml index cce43a98a9..0e89d4e0ad 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -7,16 +7,18 @@ components: - type: Clickable - type: Sprite + netsync: false directional: false - texture: Objects/Projectiles/bullet.png - #rotation: -180 + sprite: Objects/Guns/Projectiles/bullet.rsi + state: bullet - type: Icon - texture: Objects/Projectiles/bullet.png + sprite: Objects/Guns/Projectiles/bullet.rsi + state: bullet - type: Collidable hard: false shapes: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" + bounds: "-0.1,-0.1,0.1,0.1" layer: [Clickable] mask: - Impassable @@ -26,15 +28,10 @@ - type: Physics edgeslide: false - type: Projectile + soundHit: /Audio/Guns/Hits/bullet_hit.ogg damages: Brute: 20 -- type: entity - id: ProjectileBullet - name: projectilebullet - parent: BulletBase - abstract: true - - type: entity id: BulletBaseFlash name: base bullet flash @@ -42,32 +39,22 @@ abstract: true components: - type: Projectile - velocity: 20 + soundHit: /Audio/Guns/Hits/snap.ogg damages: Brute: 10 + - type: FlashProjectile + range: 1 - type: entity - id: BulletBaseHighVelocity + id: BulletBaseHV name: base bullet high-velocity parent: BulletBase abstract: true components: - type: Projectile - velocity: 27 damages: Brute: 12 -- type: entity - id: BulletBaseL - name: base bullet l - parent: BulletBase - abstract: true - components: - - type: Projectile - velocity: 15 - damages: - Brute: 10 - - type: entity id: BulletBasePractice name: base bullet practice @@ -75,9 +62,8 @@ abstract: true components: - type: Projectile - velocity: 20 damages: - Brute: 0 + Brute: 2 - type: entity id: BulletBaseRubber @@ -86,6 +72,140 @@ abstract: true components: - type: Projectile - velocity: 20 + soundHit: /Audio/Guns/Hits/snap.ogg damages: - Brute: 2 + Brute: 3 + - type: StunnableProjectile + paralyzeAmount: 2 + +- type: entity + name : taser + id: BulletTaser + abstract: true + components: + - type: Ammo + isProjectile: true + ammoVelocity: 20 + caliber: Energy + - type: Projectile + soundHitSpecies: "/Audio/Guns/Hits/taser_hit.ogg" + damages: + Heat: 5 + - type: StunnableProjectile + stunAmount: 5 + knockdownAmount: 5 + - type: Sprite + directional: false + sprite: Objects/Guns/Projectiles/spark.rsi + color: "#ffff33" + layers: + - state: spark + shader: unshaded + - type: Icon + sprite: Objects/Guns/Projectiles/spark.rsi + state: spark + color: "#ffff33" + - type: Collidable + hard: false + shapes: + - !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + layer: 32 + mask: 30 + - type: Physics + edgeslide: false + +# Launcher projectiles (grenade / rocket) +- type: entity + id: BulletRocket + name: rocket + parent: BulletBase + abstract: true + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Projectiles/rocket.rsi + state: frag + - type: ExplosiveProjectile + - type: Projectile + deleteOnCollide: false + - type: Explosive + devastationRange: 1 + heavyImpactRange: 2 + lightImpactRange: 4 + flashRange: 10 + - type: PointLight + radius: 3.5 + color: orange + energy: 0.5 + +- type: entity + id: BulletGrenadeBaton + name: baton grenade + parent: BulletBase + abstract: true + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Projectiles/grenade.rsi + state: grenade + - type: Projectile + deleteOnCollide: false + soundHit: /Audio/effects/gen_hit.ogg + - type: StunnableProjectile + paralyzeAmount: 8 + +- type: entity + id: BulletGrenadeBlast + name: blast grenade + parent: BulletBase + abstract: true + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Projectiles/grenade.rsi + state: grenade + - type: ExplosiveProjectile + - type: Projectile + deleteOnCollide: false + - type: Explosive + devastationRange: 3 + heavyImpactRange: 5 + lightImpactRange: 7 + flashRange: 10 + +- type: entity + id: BulletGrenadeFlash + name: flash grenade + parent: BulletBase + abstract: true + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Projectiles/grenade.rsi + state: grenade + - type: Projectile + deleteOnCollide: false + soundHit: /Audio/effects/flash_bang.ogg + - type: FlashProjectile + range: 7 + +# This is supposed to spawn shrapnel and stuff so uhh... TODO? +- type: entity + id: BulletGrenadeFrag + name: frag grenade + parent: BulletBase + abstract: true + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Projectiles/grenade.rsi + state: grenade + - type: ExplosiveProjectile + - type: Projectile + deleteOnCollide: false + - type: Explosive + devastationRange: 3 + heavyImpactRange: 5 + lightImpactRange: 7 + flashRange: 10 diff --git a/Resources/Prototypes/Entities/Weapons/Revolvers/pistols.yml b/Resources/Prototypes/Entities/Weapons/Revolvers/pistols.yml deleted file mode 100644 index 4a7ffdae36..0000000000 --- a/Resources/Prototypes/Entities/Weapons/Revolvers/pistols.yml +++ /dev/null @@ -1,123 +0,0 @@ -#- type: entity -# name: baserevolver -# parent: BaseItem -# id: revolver_base -# description: A rooty tooty point and shooty. -# components: -# - type: LoopingSound -# - type: BallisticMagazineWeapon -# caliber: A357 -# magazines: -# - A357 -# default_magazine: magazine_9mm -# auto_eject_magazine: false -# sound_auto_eject: /Audio/Guns/MagOut/revolver_magout.ogg -# sound_magazine_in: /Audio/Guns/MagIn/revolver_magin.ogg -# sound_magazine_out: /Audio/Guns/MagOut/revolver_magout.ogg -# sound_empty: /Audio/Guns/Empty/empty.ogg -# sound_gunshot: /Audio/Guns/Gunshots/revolver.ogg -# -#- type: entity -# name: inspector -# parent: revolver_base -# id: revolver_inspector -# description: A rooty tooty point and shooty. -# components: -# - type: Sprite -# netsync: false -# sprite: Objects/Guns/revolvers/inspector.rsi -# state: inspector-0 -# - type: Icon -# sprite: Objects/Guns/revolvers/inspector.rsi -# state: inspector-0 -# - type: LoopingSound -# - type: RangedWeapon -# spreadstddev: 2 -# automatic: false -# firerate: 8 -# - type: BallisticMagazineWeapon -# caliber: A44 -# magazines: -# - A44 -# default_magazine: magazine_44 -# sound_gunshot: /Audio/Guns/Gunshots/revolver.ogg -# sound_magazine_in: /Audio/Guns/MagIn/revolver_magin.ogg -# sound_magazine_out: /Audio/Guns/MagOut/revolver_magout.ogg -# - type: Appearance -# visuals: -# - type: BallisticMagazineWeaponVisualizer2D -# base_state: inspector -# steps: 1 -# - type: Item -# Size: 24 -# sprite: Objects/Guns/revolvers/inspector.rsi -# -#- type: entity -# name: mateba -# parent: revolver_base -# id: revolver_mateba -# description: A rooty tooty point and shooty. -# components: -# - type: Sprite -# netsync: false -# sprite: Objects/Guns/revolvers/mateba.rsi -# state: mateba-1 -# - type: Icon -# sprite: Objects/Guns/revolvers/mateba.rsi -# state: mateba-1 -# - type: LoopingSound -# - type: RangedWeapon -# spreadstddev: 2 -# automatic: false -# firerate: 8 -# - type: BallisticMagazineWeapon -# caliber: A357 -# magazines: -# - A357 -# default_magazine: -# sound_gunshot: /Audio/Guns/Gunshots/revolver.ogg -# sound_magazine_in: /Audio/Guns/MagIn/revolver_magin.ogg -# sound_magazine_out: /Audio/Guns/MagOut/revolver_magout.ogg -# - type: Appearance -# visuals: -# - type: BallisticMagazineWeaponVisualizer2D -# base_state: mateba -# steps: 2 -# - type: Item -# Size: 24 -# sprite: Objects/Guns/revolvers/mateba.rsi -# -#- type: entity -# name: revolver -# parent: revolver_base -# id: revolver_revolver -# description: A rooty tooty point and shooty. -# components: -# - type: Sprite -# netsync: false -# sprite: Objects/Guns/revolvers/revolver.rsi -# state: revolver-1 -# - type: Icon -# sprite: Objects/Guns/revolvers/revolver.rsi -# state: revolver-1 -# - type: LoopingSound -# - type: RangedWeapon -# spreadstddev: 2 -# automatic: false -# firerate: 8 -# - type: BallisticMagazineWeapon -# caliber: A357 -# magazines: -# - A357 -# default_magazine: -# sound_gunshot: /Audio/Guns/Gunshots/revolver.ogg -# sound_magazine_in: /Audio/Guns/MagIn/revolver_magin.ogg -# sound_magazine_out: /Audio/Guns/MagOut/revolver_magout.ogg -# - type: Appearance -# visuals: -# - type: BallisticMagazineWeaponVisualizer2D -# base_state: revolver -# steps: 2 -# - type: Item -# Size: 24 -# sprite: Objects/Guns/revolvers/revolver.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml new file mode 100644 index 0000000000..e16849f322 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml @@ -0,0 +1,102 @@ +- type: entity + name: RevolverBase + parent: BaseItem + id: RevolverBase + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sprite + netsync: false + state: icon + - type: Icon + state: icon + +- type: entity + name: Deckard + parent: RevolverBase + id: RevolverDeckard + description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. + components: + - type: Sprite + sprite: Objects/Guns/Revolvers/deckard.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-unshaded-3 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Icon + sprite: Objects/Guns/Revolvers/deckard.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/Revolvers/deckard.rsi + - type: RangedWeapon + - type: BoltActionBarrel + currentSelector: Single + allSelectors: + - Single + caliber: Magnum + capacity: 5 + autoCycle: true + soundGunshot: /Audio/Guns/Gunshots/revolver.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundInsert: /Audio/Guns/MagIn/revolver_magin.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 4 + zeroVisible: true + +- type: entity + name: Inspector + parent: RevolverBase + id: RevolverInspector + description: A rooty tooty point and shooty. + components: + - type: Sprite + sprite: Objects/Guns/Revolvers/inspector.rsi + - type: Icon + sprite: Objects/Guns/Revolvers/inspector.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/Revolvers/inspector.rsi + - type: RangedWeapon + - type: RevolverBarrel + currentSelector: Single + allSelectors: + - Single + caliber: Magnum + capacity: 7 + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundGunshot: /Audio/Guns/Gunshots/revolver.ogg + soundEject: /Audio/Guns/MagOut/revolver_magout.ogg + soundInsert: /Audio/Guns/MagIn/revolver_magin.ogg + +- type: entity + name: Mateba + parent: RevolverBase + id: RevolverMateba + description: A rooty tooty point and shooty. + components: + - type: Sprite + sprite: Objects/Guns/Revolvers/mateba.rsi + - type: Icon + sprite: Objects/Guns/Revolvers/mateba.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/Revolvers/mateba.rsi + - type: RangedWeapon + - type: RevolverBarrel + currentSelector: Single + allSelectors: + - Single + caliber: Magnum + capacity: 7 + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundGunshot: /Audio/Guns/Gunshots/revolver.ogg + soundEject: /Audio/Guns/MagOut/revolver_magout.ogg + soundInsert: /Audio/Guns/MagIn/revolver_magin.ogg diff --git a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml index b59d0c952e..8ec39ca798 100644 --- a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml @@ -1,287 +1,312 @@ - type: entity - name: baserifle + name: BaseRifle parent: BaseItem id: RifleBase description: A rooty tooty point and shooty. abstract: true components: - - type: LoopingSound - - type: BallisticMagazineWeapon - caliber: A762mm - magazines: - - A762mm - default_magazine: magazine_762mm_filled - auto_eject_magazine: false - sound_magazine_in: /Audio/Guns/MagIn/batrifle_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/batrifle_magout.ogg - sound_empty: /Audio/Guns/Empty/empty.ogg - sound_gunshot: /Audio/Guns/Gunshots/batrifle.ogg + - type: Sprite + netsync: false + - type: Icon + state: icon + - type: Item + size: 24 + state: icon + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Automatic + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 90 + soundGunshot: /Audio/Guns/Gunshots/batrifle.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundRack: /Audio/Guns/Cock/sf_rifle_cock.ogg + soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Guns/MagIn/batrifle_magin.ogg + soundMagEject: /Audio/Guns/MagOut/batrifle_magout.ogg - type: entity - name: ak + name: AKMS parent: RifleBase id: RifleAk - description: A rooty tooty point and shooty. + description: Weapon of the oppressed, oppressors, and extremists of all flavours. This is a copy of an ancient semi-automatic rifle chambered for .30 Rifle. If it won't fire, percussive maintenance should get it working again. It is known for its easy maintenance, and low price. This gun is not in active military service anymore, but has become ubiquitous among criminals and insurgents. This is a high-quality copy, which has an automatic fire mode. components: - type: Sprite - netsync: false sprite: Objects/Guns/Rifles/ak.rsi - state: ak-0 + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon sprite: Objects/Guns/Rifles/ak.rsi - state: ak-0 - - type: LoopingSound - - type: RangedWeapon - spreadstddev: 2 - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A762mm - magazines: - - A762mm - default_magazine: magazine_ak - sound_gunshot: /Audio/Guns/Gunshots/rifle2.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: ak - steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Rifles/ak.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: LRifle + magazineTypes: + - Rifle + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 90 + soundGunshot: /Audio/Guns/Gunshots/rifle2.ogg + soundRack: /Audio/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true - type: entity - name: black ak + name: black AK parent: RifleBase id: RifleBlackAk - description: A rooty tooty point and shooty. + description: Weapon of the oppressed, oppressors, and extremists of all flavours. This is a copy of an ancient semi-automatic rifle chambered for .30 Rifle. If it won't fire, percussive maintenance should get it working again. It is known for its easy maintenance, and low price. This gun is not in active military service anymore, but has become ubiquitous among criminals and insurgents. This is a high-quality copy, which has an automatic fire mode. components: - type: Sprite - netsync: false - sprite: Objects/Guns/Rifles/black-ak.rsi - state: black-ak-0 + sprite: Objects/Guns/Rifles/black_ak.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/Rifles/black-ak.rsi - state: black-ak-0 - - type: LoopingSound - - type: RangedWeapon - spreadstddev: 2 - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A762mm - magazines: - - A762mm - default_magazine: magazine_ak - sound_gunshot: /Audio/Guns/Gunshots/rifle2.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: black-ak - steps: 1 + sprite: Objects/Guns/Rifles/black_ak.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/black-ak.rsi + sprite: Objects/Guns/Rifles/black_ak.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: LRifle + magazineTypes: + - Rifle + fireRate: 6 + minAngle: 0 + maxAngle: 60 + angleIncrease: 15 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/rifle2.ogg + soundRack: /Audio/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true - type: entity - name: carbine + name: Z8 Bulldog parent: RifleBase id: RifleCarbine - description: A rooty tooty point and shooty. + description: The Z8 Bulldog is an older bullpup carbine model, made by Frozen Star. components: - type: Sprite - netsync: false sprite: Objects/Guns/Rifles/carbine.rsi - state: carbine-5 + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon sprite: Objects/Guns/Rifles/carbine.rsi - state: carbine-5 - - type: LoopingSound - - type: RangedWeapon - spreadstddev: 1.5 - automatic: true - firerate: 6 - - type: BallisticMagazineWeapon - caliber: A10mm - magazines: - - A10mmSMG - default_magazine: magazine_10mm_smg - sound_gunshot: /Audio/Guns/Gunshots/rifle2.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: carbine - steps: 6 - type: Item Size: 24 sprite: Objects/Guns/Rifles/carbine.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: SRifle + magazineTypes: + - Rifle + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/batrifle.ogg + soundRack: /Audio/Guns/Cock/batrifle_cock.ogg + soundMagInsert: /Audio/Guns/MagIn/batrifle_magin.ogg + soundMagEject: /Audio/Guns/MagOut/batrifle_magout.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true - type: entity - name: dallas + name: Dallas parent: RifleBase id: RifleDallas - description: A rooty tooty point and shooty. + description: Dallas is a pulse-action air-cooled automatic assault rifle made by unknown manufacturer. This weapon is very rare, but deadly efficient. It's used by elite mercenaries, assassins or bald marines. components: - type: Sprite - netsync: false sprite: Objects/Guns/Rifles/dallas.rsi - state: dallas-0 + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon sprite: Objects/Guns/Rifles/dallas.rsi - state: dallas-0 - - type: LoopingSound - - type: RangedWeapon - spreadstddev: 2 - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A24mm - magazines: - - A24mm - default_magazine: magazine_24mm - auto_eject_magazine: true - sound_gunshot: /Audio/Guns/Gunshots/rifle2.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: dallas - steps: 1 - type: Item Size: 24 sprite: Objects/Guns/Rifles/dallas.rsi - -- type: entity - name: IH heavy rifle - parent: RifleBase - id: RifleIhHeavy - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Rifles/ih_heavyrifle.rsi - state: ih_heavyrifle-0 - - type: Icon - sprite: Objects/Guns/Rifles/ih_heavyrifle.rsi - state: ih_heavyrifle-0 - - type: LoopingSound - type: RangedWeapon - spreadstddev: 1.5 - automatic: true - firerate: 6 - - type: BallisticMagazineWeapon - caliber: A10mm - magazines: - - A10mmSMG - default_magazine: magazine_10mm_smg - auto_eject_magazine: true - sound_gunshot: /Audio/Guns/Gunshots/ltrifle.ogg + - type: MagazineBarrel + caliber: ClRifle + magazineTypes: + - Rifle + fireRate: 8 + minAngle: 10 + maxAngle: 60 + angleIncrease: 10 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/m41.ogg + soundRack: /Audio/Guns/Cock/m41_cock.ogg + soundMagInsert: /Audio/Guns/MagIn/m41_reload.ogg + soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: ih_heavyrifle + - type: MagVisualizer2D + magState: mag steps: 1 - - type: Item - Size: 24 - sprite: Objects/Guns/Rifles/ih_heavyrifle.rsi + zeroVisible: true - type: entity - name: sol-eot + name: STS-35 parent: RifleBase - id: RifleSolEot - description: A rooty tooty point and shooty. + id: RifleSTS + description: The rugged STS-35 is a durable automatic weapon, popular on frontier worlds. Uses .30 Rifle rounds. This one is unmarked. components: - type: Sprite - netsync: false - sprite: Objects/Guns/Rifles/sol-eot.rsi - state: sol-eot-4 - - type: Icon - sprite: Objects/Guns/Rifles/sol-eot.rsi - state: sol-eot-4 - - type: RangedWeapon - spreadstddev: 2.8 - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A65mm - magazines: - - A65mm - default_magazine: magazine_65mm - auto_eject_magazine: true - lmg_alarm_animation: true - sound_auto_eject: /Audio/Guns/EmptyAlarm/lmg_empty_alarm.ogg - sound_gunshot: /Audio/Guns/Gunshots/rifle.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: sol-eot - steps: 5 - - type: Item - Size: 24 - sprite: Objects/Guns/Rifles/sol-eot.rsi - -- type: entity - name: sol-para - parent: RifleBase - id: RifleSolPara - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/Rifles/sol-para.rsi - state: sol-para-4 - - type: Icon - sprite: Objects/Guns/Rifles/sol-para.rsi - state: sol-para-4 - - type: RangedWeapon - spreadstddev: 3 - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A65mm - magazines: - - A65mm - default_magazine: magazine_65mm - auto_eject_magazine: true - lmg_alarm_animation: true - sound_auto_eject: /Audio/Guns/EmptyAlarm/lmg_empty_alarm.ogg - sound_gunshot: /Audio/Guns/Gunshots/rifle.ogg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: sol-para - steps: 5 - - type: Item - Size: 24 - sprite: Objects/Guns/Rifles/sol-para.rsi - -- type: entity - name: sts - parent: RifleBase - id: RifleSts - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false sprite: Objects/Guns/Rifles/sts.rsi - state: sts-0 + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon sprite: Objects/Guns/Rifles/sts.rsi - state: sts-0 + - type: Item + Size: 24 + sprite: Objects/Guns/Rifles/sts.rsi - type: RangedWeapon - spreadstddev: 2 - automatic: true - firerate: 6 - - type: BallisticMagazineWeapon - caliber: A65mm - magazines: - - A65mm - default_magazine: magazine_65mm - sound_gunshot: /Audio/Guns/Gunshots/rifle2.ogg + - type: MagazineBarrel + caliber: LRifle + magazineTypes: + - Rifle + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/ltrifle.ogg + soundRack: /Audio/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg - type: Appearance visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: sts + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag steps: 1 + zeroVisible: true + +- type: entity + name: Vintorez + parent: RifleBase + id: RifleVintorez + description: This gun is a copy of a design from a country that no longer exists. It is still highly prized for its armor piercing capabilities. + components: + - type: Sprite + sprite: Objects/Guns/Rifles/vintorez.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + sprite: Objects/Guns/Rifles/vintorez.rsi - type: Item Size: 24 - sprite: Objects/Guns/Rifles/sts.rsi + sprite: Objects/Guns/Rifles/vintorez.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: SRifle + magazineTypes: + - Rifle + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 60 + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true + +- type: entity + name: Wintermute + parent: RifleBase + id: RifleWintermute + description: A high end military grade assault rifle, designed as a modern ballistic infantry weapon. Primarily used by and produced for IH troops. + components: + - type: Sprite + sprite: Objects/Guns/Rifles/wintermute.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + sprite: Objects/Guns/Rifles/wintermute.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/Rifles/wintermute.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: SRifle + magazineTypes: + - Rifle + autoEjectMag: true + fireRate: 5 + minAngle: 0 + maxAngle: 45 + angleIncrease: 15 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/ltrifle.ogg + soundRack: /Audio/Guns/Cock/ltrifle_cock.ogg + soundMagInsert: /Audio/Guns/MagIn/ltrifle_magin.ogg + soundMagEject: /Audio/Guns/MagOut/ltrifle_magout.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true diff --git a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml index b91eb4a659..acbb218e9e 100644 --- a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml @@ -1,214 +1,274 @@ - type: entity - name: basesmg + name: BaseSMG parent: BaseItem id: SmgBase description: A rooty tooty point and shooty. abstract: true components: - - type: LoopingSound - - type: RangedWeapon - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: 12mm - magazines: - - A10mmSMG - default_magazine: magazine_10mm_smg - auto_eject_magazine: false - sound_auto_eject: /Audio/Guns/EmptyAlarm/smg_empty_alarm.ogg - sound_magazine_in: /Audio/Guns/MagIn/smg_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/smg_magout.ogg - sound_empty: /Audio/Guns/Empty/empty.ogg - sound_gunshot: /Audio/Guns/Gunshots/smg.ogg + - type: Sprite + netsync: false + - type: Icon + state: icon + - type: Item + size: 24 + state: icon + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Single + - Automatic + fireRate: 8 + caliber: Pistol + magazineTypes: + - Smg + minAngle: 5 + maxAngle: 60 + angleIncrease: 10 + angleDecay: 60 + soundGunshot: /Audio/Guns/Gunshots/smg.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundRack: /Audio/Guns/Cock/smg_cock.ogg + soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Guns/MagIn/smg_magin.ogg + soundMagEject: /Audio/Guns/MagOut/smg_magout.ogg - type: entity - name: c-20r sub machine gun + name: Atreides + parent: SmgBase + id: SmgAtreides + description: Pla-ket-ket-ket-ket + components: + - type: Sprite + sprite: Objects/Guns/SMGs/atreides.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + sprite: Objects/Guns/SMGs/atreides.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/SMGs/atreides.rsi + - type: RangedWeapon + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Automatic + fireRate: 10 + caliber: Pistol + magazineTypes: + - Smg + minAngle: 10 + maxAngle: 60 + angleIncrease: 12 + angleDecay: 60 + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true + +- type: entity + name: C-20r sub machine gun parent: SmgBase id: SmgC20r description: A rooty tooty point and shooty. components: - type: Sprite - netsync: false sprite: Objects/Guns/SMGs/c20r.rsi - state: c20r-5 + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon sprite: Objects/Guns/SMGs/c20r.rsi - state: c20r-5 - - type: RangedWeapon - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A10mm - magazines: - - A10mmSMG - default_magazine: magazine_10mm_smg - auto_eject_magazine: true - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: c20r - steps: 6 - type: Item Size: 24 sprite: Objects/Guns/SMGs/c20r.rsi + - type: RangedWeapon + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Single + - Automatic + fireRate: 8 + caliber: Pistol + magazineTypes: + - Smg + minAngle: 5 + maxAngle: 60 + angleIncrease: 10 + angleDecay: 60 + autoEjectMag: true + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true - type: entity - name: IH SMG + name: Drozd parent: SmgBase - id: SmgIhSmg + id: SmgDrozd + description: An excellent fully automatic Heavy SMG. Rifled to take a larger caliber than a typical submachine gun, but unlike other heavy SMGs makes use of increased caliber to achieve excellent armor penetration capabilities. Suffers a bit less from poor recoil control and has worse than average fire rate. + components: + - type: Sprite + sprite: Objects/Guns/SMGs/drozd.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + sprite: Objects/Guns/SMGs/drozd.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/SMGs/drozd.rsi + - type: RangedWeapon + - type: MagazineBarrel + fireRate: 6 + currentSelector: Automatic + allSelectors: + - Automatic + caliber: Magnum + magazineTypes: + - Smg + minAngle: 5 + maxAngle: 60 + angleIncrease: 12 + angleDecay: 60 + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true + +- type: entity + name: Straylight + parent: SmgBase + id: SmgStraylight description: Pla-ket-ket-ket-ket components: - type: Sprite - netsync: false - sprite: Objects/Guns/SMGs/ih_smg.rsi - state: ih_smg-0 + sprite: Objects/Guns/SMGs/straylight.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/SMGs/ih_smg.rsi - state: ih_smg-0 - - type: LoopingSound - - type: RangedWeapon - automatic: true - firerate: 16 - - type: BallisticMagazineWeapon - spreadstddev: 6 - caliber: A9mm - magazines: - - A9mmSMG - default_magazine: magazine_9mm_smg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: ih_smg - steps: 1 + sprite: Objects/Guns/SMGs/straylight.rsi - type: Item Size: 24 - sprite: Objects/Guns/SMGs/ih_smg.rsi - -- type: entity - name: IH SMG (silenced) - parent: SmgBase - id: SmgIhSmgS - description: Pewsh pewsh - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/SMGs/ih_smg_s.rsi - state: ih_smg_s-0 - - type: Icon - sprite: Objects/Guns/SMGs/ih_smg_s.rsi - state: ih_smg_s-0 - - type: LoopingSound + sprite: Objects/Guns/SMGs/straylight.rsi - type: RangedWeapon - automatic: true - firerate: 16 - - type: BallisticMagazineWeapon - spreadstddev: 6 - caliber: A9mm - magazines: - - A9mmSMG - default_magazine: magazine_9mm_smg - sound_gunshot: /Audio/Guns/Gunshots/silenced.ogg + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Single + - Automatic + fireRate: 10 + caliber: Pistol + magazineTypes: + - Smg - type: Appearance visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: ih_smg_s + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag steps: 1 - - type: Item - Size: 24 - sprite: Objects/Guns/SMGs/ih_smg_s.rsi + zeroVisible: true - type: entity - name: mac - parent: SmgBase - id: SmgMac - description: Pla-ket-ket-ket-ket - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/SMGs/mac.rsi - state: mac-0 - - type: Icon - sprite: Objects/Guns/SMGs/mac.rsi - state: mac-0 - - type: LoopingSound - - type: RangedWeapon - automatic: true - firerate: 16 - - type: BallisticMagazineWeapon - spreadstddev: 6 - caliber: A9mm - magazines: - - A9mmSMG - default_magazine: magazine_9mm_smg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: mac - steps: 1 - - type: Item - Size: 24 - sprite: Objects/Guns/SMGs/mac.rsi - -- type: entity - name: saber - parent: SmgBase - id: SmgSaber - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/Guns/SMGs/saber.rsi - state: saber-0 - - type: Icon - sprite: Objects/Guns/SMGs/saber.rsi - state: saber-0 - - type: LoopingSound - - type: RangedWeapon - automatic: true - firerate: 12 - - type: BallisticMagazineWeapon - spreadstddev: 4 - caliber: A9mm - magazines: - - A9mmSMG - default_magazine: magazine_9mm_smg - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: saber - steps: 1 - - type: Item - Size: 24 - sprite: Objects/Guns/SMGs/saber.rsi - -- type: entity - name: wt550 + name: WT550 parent: SmgBase id: SmgWt550 description: A rooty tooty point and shooty. components: - type: Sprite - netsync: false sprite: Objects/Guns/SMGs/wt550.rsi - state: wt550-5 + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: base-unshaded + map: ["enum.RangedBarrelVisualLayers.BaseUnshaded"] + shader: unshaded + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: mag-unshaded-0 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded - type: Icon sprite: Objects/Guns/SMGs/wt550.rsi - state: wt550-5 - - type: LoopingSound - - type: RangedWeapon - spreadstddev: 3.5 - automatic: true - firerate: 10 - - type: BallisticMagazineWeapon - caliber: A9mm - magazines: - - A9mmTopMounted - default_magazine: magazine_9mmtm - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: wt550 - steps: 6 - type: Item Size: 24 sprite: Objects/Guns/SMGs/wt550.rsi + - type: RangedWeapon + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Automatic + fireRate: 8 + caliber: Pistol + magazineTypes: + - SmgTopMounted + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 6 + zeroVisible: true + +- type: entity + name: Zoric + parent: SmgBase + id: SmgZoric + description: A rooty tooty point and shooty. + components: + - type: Sprite + sprite: Objects/Guns/SMGs/zoric.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Icon + sprite: Objects/Guns/SMGs/zoric.rsi + - type: Item + Size: 24 + sprite: Objects/Guns/SMGs/zoric.rsi + - type: RangedWeapon + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Automatic + fireRate: 8 + caliber: Magnum + magazineTypes: + - Smg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true diff --git a/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml index fffa43a253..f74118a9fe 100644 --- a/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml @@ -1,44 +1,237 @@ - type: entity - name: shotgun + name: ShotgunBase parent: BaseItem - id: BaseShotgun + id: ShotgunBase description: A rooty tooty point and shooty. abstract: true components: - - type: LoopingSound - - type: RangedWeapon - automatic: false - firerate: 20 - - type: BallisticMagazineWeapon - caliber: A12g - evenspread : 40 - magazines: - - A12g - default_magazine: magazine_12g_shotgun - auto_eject_magazine: false - sound_auto_eject: /Audio/Guns/EmptyAlarm/smg_empty_alarm.ogg - sound_magazine_in: /Audio/Guns/MagIn/smg_magin.ogg - sound_magazine_out: /Audio/Guns/MagOut/smg_magout.ogg - sound_empty: /Audio/Guns/Empty/empty.ogg - sound_gunshot: /Audio/Guns/Gunshots/smg.ogg + - type: Sprite + netsync: false + state: icon + - type: Icon + state: icon + - type: Item + Size: 24 + - type: PumpBarrel + currentSelector: Single + allSelectors: + - Single + caliber: Shotgun + capacity: 7 + fireRate: 2.0 + minAngle: 10 + maxAngle: 60 + angleIncrease: 30 + angleDecay: 30 + soundGunshot: /Audio/Guns/Gunshots/shotgun.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundInsert: /Audio/Guns/MagIn/shotgun_insert.ogg - type: entity - name: magazine fed shotgun - parent: BaseShotgun - id: MagazineFedShotgun + name: Bojevic + parent: BaseItem + id: ShotgunBojevic + description: It's a magazine-fed shotgun designed for close quarters combat, nicknamed 'Striker' by boarding parties. A robust and reliable design allows you to swap magazines on the go and dump as many shells at your foes as you want... if you can manage the recoil, of course. components: - type: Sprite netsync: false - sprite: Objects/Guns/SMGs/c20r.rsi - state: c20r-5 + sprite: Objects/Guns/Shotguns/bojevic.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - state: mag-0 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Icon - sprite: Objects/Guns/SMGs/c20r.rsi - state: c20r-5 + sprite: Objects/Guns/Shotguns/bojevic.rsi + state: icon + - type: Item + sprite: Objects/Guns/Shotguns/bojevic.rsi + - type: RangedWeapon + - type: MagazineBarrel + currentSelector: Automatic + allSelectors: + - Automatic + fireRate: 3 + caliber: Shotgun + magazineTypes: + - Rifle + soundGunshot: /Audio/Guns/Gunshots/shotgun.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundRack: /Audio/Guns/Cock/smg_cock.ogg + soundBoltOpen: /Audio/Guns/Bolt/rifle_bolt_open.ogg + soundBoltClosed: /Audio/Guns/Bolt/rifle_bolt_closed.ogg + soundMagInsert: /Audio/Guns/MagIn/smg_magin.ogg + soundMagEject: /Audio/Guns/MagOut/smg_magout.ogg - type: Appearance visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: c20r - steps: 6 + - type: BarrelBoltVisualizer2D + - type: MagVisualizer2D + magState: mag + steps: 1 + zeroVisible: true + +- type: entity + name: double-barreled shotgun + parent: BaseItem + id: ShotgunDB + description: An immortal classic. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Shotguns/db_shotgun.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - type: Icon + sprite: Objects/Guns/Shotguns/db_shotgun.rsi + state: icon - type: Item - Size: 24 - sprite: Objects/Guns/SMGs/c20r.rsi + sprite: Objects/Guns/Shotguns/db_shotgun.rsi + state: icon + - type: RangedWeapon + - type: BoltActionBarrel + caliber: Shotgun + currentSelector: Single + allSelectors: + - Single + capacity: 2 + fireRate: 8.0 + minAngle: 10 + maxAngle: 60 + angleIncrease: 30 + angleDecay: 30 + ammoSpreadRatio: 0.7 + soundGunshot: /Audio/Guns/Gunshots/shotgun.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundInsert: /Audio/Guns/MagIn/shotgun_insert.ogg + sound_bolt_open: /Audio/Guns/Cock/shotgun_open.ogg + sound_bolt_closed: /Audio/Guns/Cock/shotgun_close.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + +- type: entity + name: Bull + parent: ShotgunBase + id: ShotgunBull + description: A Frozen Star pump-action shotgun. A marvel of engineering, this gun is often used by Ironhammer tactical units. Due to shorter than usual barrels, recoil kicks slightly harder. + components: + - type: Sprite + sprite: Objects/Guns/Shotguns/bull.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-1 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Icon + sprite: Objects/Guns/Shotguns/bull.rsi + - type: Item + sprite: Objects/Guns/Shotguns/bull.rsi + - type: RangedWeapon + - type: PumpBarrel + fireRate: 4.0 + minAngle: 10 + maxAngle: 120 + - type: Appearance + visuals: + - type: MagVisualizer2D + magState: mag + steps: 5 + zeroVisible: false + +- type: entity + name: Gladstone + parent: ShotgunBase + id: ShotgunGladstone + description: It is a next-generation Frozen Star shotgun intended as a cost-effective competitor to the aging NT "Regulator 1000". It has a semi-rifled lightweight full-length barrel which gives it exceptional accuracy with all types of ammunition, with a high-capacity magazine tube below it. + components: + - type: Sprite + sprite: Objects/Guns/Shotguns/gladstone.rsi + - type: Icon + sprite: Objects/Guns/Shotguns/gladstone.rsi + - type: Item + sprite: Objects/Guns/Shotguns/gladstone.rsi + - type: RangedWeapon + - type: PumpBarrel + capacity: 9 + ammoSpreadRatio: 0.5 + +- type: entity + name: Regulator 1000 + parent: ShotgunBase + id: ShotgunRegulator + description: Designed for close quarters combat, the Regulator is widely regarded as a weapon of choice for repelling boarders. Some may say that it's too old, but it actually proved itself useful. + components: + - type: Sprite + sprite: Objects/Guns/Shotguns/regulator.rsi + - type: Icon + sprite: Objects/Guns/Shotguns/regulator.rsi + - type: Item + sprite: Objects/Guns/Shotguns/regulator.rsi + - type: RangedWeapon + - type: PumpBarrel + capacity: 7 + ammoSpreadRatio: 0.7 + +- type: entity + name: Kammerer + parent: ShotgunBase + id: ShotgunPump + description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. + components: + - type: Sprite + sprite: Objects/Guns/Shotguns/pump.rsi + - type: Icon + sprite: Objects/Guns/Shotguns/pump.rsi + - type: Item + sprite: Objects/Guns/Shotguns/pump.rsi + - type: RangedWeapon + - type: PumpBarrel + capacity: 4 + ammoSpreadRatio: 0.7 + +- type: entity + name: sawn-off shotgun + parent: BaseItem + id: ShotgunSawn + description: Omar's coming! + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Shotguns/sawn.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - type: Icon + sprite: Objects/Guns/Shotguns/sawn.rsi + state: icon + - type: Item + sprite: Objects/Guns/Shotguns/sawn.rsi + state: icon + - type: RangedWeapon + - type: BoltActionBarrel + caliber: Shotgun + currentSelector: Single + allSelectors: + - Single + capacity: 2 + fireRate: 8.0 + minAngle: 10 + maxAngle: 90 + angleIncrease: 45 + angleDecay: 30 + soundGunshot: /Audio/Guns/Gunshots/shotgun.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundInsert: /Audio/Guns/MagIn/shotgun_insert.ogg + soundBoltOpen: /Audio/Guns/Cock/shotgun_open.ogg + soundBoltClosed: /Audio/Guns/Cock/shotgun_close.ogg + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D diff --git a/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml b/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml new file mode 100644 index 0000000000..61eadb9802 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml @@ -0,0 +1,84 @@ +- type: entity + name: SniperBase + parent: BaseItem + id: SniperBase + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Sprite + netsync: false + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: bolt-closed + map: ["enum.RangedBarrelVisualLayers.Bolt"] + - type: Icon + state: icon + - type: Item + Size: 24 + - type: BoltActionBarrel + currentSelector: Single + allSelectors: + - Single + caliber: LRifle + capacity: 10 + fireRate: 1.0 + minAngle: 5 + maxAngle: 45 + angleIncrease: 20 + angleDecay: 15 + soundGunshot: /Audio/Guns/Gunshots/sniper.ogg + soundEmpty: /Audio/Guns/Empty/empty.ogg + soundInsert: /Audio/Guns/MagIn/bullet_insert.ogg + +- type: entity + name: Kardashev-Mosin + parent: SniperBase + id: SniperBoltGun + description: Weapon for hunting, or endless trench warfare. If you’re on a budget, it’s a darn good rifle for just about everything. + components: + - type: Sprite + sprite: Objects/Guns/Snipers/bolt_gun.rsi + - type: Icon + sprite: Objects/Guns/Snipers/bolt_gun.rsi + - type: Item + sprite: Objects/Guns/Snipers/bolt_gun.rsi + - type: RangedWeapon + - type: BoltActionBarrel + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + +- type: entity + name: Kardashev-Mosin + parent: SniperBase + id: SniperBoltGunWood + description: Weapon for hunting, or endless trench warfare. If you’re on a budget, it’s a darn good rifle for just about everything. + components: + - type: Sprite + sprite: Objects/Guns/Snipers/bolt_gun_wood.rsi + - type: Icon + sprite: Objects/Guns/Snipers/bolt_gun_wood.rsi + - type: RangedWeapon + - type: BoltActionBarrel + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D + +- type: entity + name: Hristov + parent: SniperBase + id: SniperHeavy + description: A portable anti-armour rifle, fitted with a scope, it was originally designed for use against armoured exosuits. It is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells. + components: + - type: Sprite + sprite: Objects/Guns/Snipers/heavy_sniper.rsi + - type: Icon + sprite: Objects/Guns/Snipers/heavy_sniper.rsi + - type: RangedWeapon + - type: BoltActionBarrel + caliber: AntiMaterial + capacity: 1 + - type: Appearance + visuals: + - type: BarrelBoltVisualizer2D diff --git a/Resources/Prototypes/MeleeWeaponAnimations/default.yml b/Resources/Prototypes/MeleeWeaponAnimations/default.yml index c7fe845719..0259f33948 100644 --- a/Resources/Prototypes/MeleeWeaponAnimations/default.yml +++ b/Resources/Prototypes/MeleeWeaponAnimations/default.yml @@ -5,3 +5,10 @@ length: 0.1 color: 255,255,255,1020 colorDelta: 0,0,0,-5100 + +- type: MeleeWeaponAnimation + id: fist + state: fist + arcType: Poke + length: 0.15 + speed: 1 diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/golem.rsi/equipped-OUTERCLOTHING.png deleted file mode 100644 index d2bf9f8972..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/golem.rsi/equipped-OUTERCLOTHING.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/golem.rsi/icon.png deleted file mode 100644 index d2bf9f8972..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/golem.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-left.png deleted file mode 100644 index 0858c19f05..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-right.png deleted file mode 100644 index 0858c19f05..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/golem.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/golem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/golem.rsi/meta.json deleted file mode 100644 index 61d7ba4ddf..0000000000 --- a/Resources/Textures/Clothing/OuterClothing/golem.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https:github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 1}, {"name": "icon", "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]]}]} diff --git a/Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/capcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/cecloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/cmocloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png b/Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png new file mode 100644 index 0000000000..4ae018ab3a Binary files /dev/null and b/Resources/Textures/Clothing/cloak.rsi/heraldcloak-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png b/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png new file mode 100644 index 0000000000..7c4fef28aa Binary files /dev/null and b/Resources/Textures/Clothing/cloak.rsi/heraldcloak.png differ diff --git a/Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/hopcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/hoscloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/meta.json b/Resources/Textures/Clothing/cloak.rsi/meta.json index 7f6607aea1..651d692e7c 100644 --- a/Resources/Textures/Clothing/cloak.rsi/meta.json +++ b/Resources/Textures/Clothing/cloak.rsi/meta.json @@ -6,7 +6,7 @@ }, "states": [ { - "name": "capcloak-equipped-BACKPACK", + "name": "capcloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -24,7 +24,7 @@ ] }, { - "name": "cecloak-equipped-BACKPACK", + "name": "cecloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -42,7 +42,7 @@ ] }, { - "name": "cmocloak-equipped-BACKPACK", + "name": "cmocloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -60,7 +60,7 @@ ] }, { - "name": "hopcloak-equipped-BACKPACK", + "name": "hopcloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -78,7 +78,7 @@ ] }, { - "name": "hoscloak-equipped-BACKPACK", + "name": "hoscloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -96,7 +96,7 @@ ] }, { - "name": "qmcloak-equipped-BACKPACK", + "name": "qmcloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -114,7 +114,7 @@ ] }, { - "name": "rdcloak-equipped-BACKPACK", + "name": "rdcloak-equipped-NECK", "directions": 4, "delays": [ [ @@ -193,6 +193,33 @@ 1 ] ] + }, + { + "name": "heraldcloak", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "heraldcloak-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/qmcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-BACKPACK.png b/Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-BACKPACK.png rename to Resources/Textures/Clothing/cloak.rsi/rdcloak-equipped-NECK.png diff --git a/Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png new file mode 100644 index 0000000000..91bbe81d37 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/bling-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/bling.png b/Resources/Textures/Clothing/neck.rsi/bling.png new file mode 100644 index 0000000000..7e999c17b6 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/bling.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png new file mode 100644 index 0000000000..34c7ddb0bc Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/dettie-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/dettie.png b/Resources/Textures/Clothing/neck.rsi/dettie.png new file mode 100644 index 0000000000..ee8d3a346f Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/dettie.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png new file mode 100644 index 0000000000..671cf6b361 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_off-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_off.png b/Resources/Textures/Clothing/neck.rsi/headphones_off.png new file mode 100644 index 0000000000..f1ea592a60 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_off.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png new file mode 100644 index 0000000000..59841d347e Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_on-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png new file mode 100644 index 0000000000..ab7a61a123 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png new file mode 100644 index 0000000000..8a09470e94 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/headphones_on.png b/Resources/Textures/Clothing/neck.rsi/headphones_on.png new file mode 100644 index 0000000000..f1ea592a60 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/headphones_on.png differ diff --git a/Resources/Textures/Clothing/back.rsi/meta.json b/Resources/Textures/Clothing/neck.rsi/meta.json similarity index 77% rename from Resources/Textures/Clothing/back.rsi/meta.json rename to Resources/Textures/Clothing/neck.rsi/meta.json index 71924c6ab8..2f4e6fc712 100644 --- a/Resources/Textures/Clothing/back.rsi/meta.json +++ b/Resources/Textures/Clothing/neck.rsi/meta.json @@ -8,7 +8,7 @@ "copyright": "https://github.com/tgstation/tgstation", "states": [ { - "name": "sheetNT-equipped-BACKPACK", + "name": "sheetNT-equipped-NECK", "directions": 4, "delays": [ [ @@ -26,7 +26,7 @@ ] }, { - "name": "sheetUSA-equipped-BACKPACK", + "name": "sheetUSA-equipped-NECK", "directions": 4, "delays": [ [ @@ -44,7 +44,7 @@ ] }, { - "name": "sheetblack-equipped-BACKPACK", + "name": "sheetblack-equipped-NECK", "directions": 4, "delays": [ [ @@ -62,7 +62,7 @@ ] }, { - "name": "sheetblue-equipped-BACKPACK", + "name": "sheetblue-equipped-NECK", "directions": 4, "delays": [ [ @@ -80,7 +80,7 @@ ] }, { - "name": "sheetbrown-equipped-BACKPACK", + "name": "sheetbrown-equipped-NECK", "directions": 4, "delays": [ [ @@ -98,7 +98,7 @@ ] }, { - "name": "sheetcaptain-equipped-BACKPACK", + "name": "sheetcaptain-equipped-NECK", "directions": 4, "delays": [ [ @@ -116,7 +116,7 @@ ] }, { - "name": "sheetce-equipped-BACKPACK", + "name": "sheetce-equipped-NECK", "directions": 4, "delays": [ [ @@ -134,7 +134,7 @@ ] }, { - "name": "sheetcentcom-equipped-BACKPACK", + "name": "sheetcentcom-equipped-NECK", "directions": 4, "delays": [ [ @@ -152,7 +152,7 @@ ] }, { - "name": "sheetclown-equipped-BACKPACK", + "name": "sheetclown-equipped-NECK", "directions": 4, "delays": [ [ @@ -170,7 +170,7 @@ ] }, { - "name": "sheetcmo-equipped-BACKPACK", + "name": "sheetcmo-equipped-NECK", "directions": 4, "delays": [ [ @@ -188,7 +188,7 @@ ] }, { - "name": "sheetcosmos-equipped-BACKPACK", + "name": "sheetcosmos-equipped-NECK", "directions": 4, "delays": [ [ @@ -226,7 +226,7 @@ ] }, { - "name": "sheetcult-equipped-BACKPACK", + "name": "sheetcult-equipped-NECK", "directions": 4, "delays": [ [ @@ -256,7 +256,7 @@ ] }, { - "name": "sheetgreen-equipped-BACKPACK", + "name": "sheetgreen-equipped-NECK", "directions": 4, "delays": [ [ @@ -274,7 +274,7 @@ ] }, { - "name": "sheetgrey-equipped-BACKPACK", + "name": "sheetgrey-equipped-NECK", "directions": 4, "delays": [ [ @@ -292,7 +292,7 @@ ] }, { - "name": "sheethop-equipped-BACKPACK", + "name": "sheethop-equipped-NECK", "directions": 4, "delays": [ [ @@ -310,7 +310,7 @@ ] }, { - "name": "sheethos-equipped-BACKPACK", + "name": "sheethos-equipped-NECK", "directions": 4, "delays": [ [ @@ -328,7 +328,7 @@ ] }, { - "name": "sheetian-equipped-BACKPACK", + "name": "sheetian-equipped-NECK", "directions": 4, "delays": [ [ @@ -346,7 +346,7 @@ ] }, { - "name": "sheetmedical-equipped-BACKPACK", + "name": "sheetmedical-equipped-NECK", "directions": 4, "delays": [ [ @@ -364,7 +364,7 @@ ] }, { - "name": "sheetmime-equipped-BACKPACK", + "name": "sheetmime-equipped-NECK", "directions": 4, "delays": [ [ @@ -382,7 +382,7 @@ ] }, { - "name": "sheetorange-equipped-BACKPACK", + "name": "sheetorange-equipped-NECK", "directions": 4, "delays": [ [ @@ -400,7 +400,7 @@ ] }, { - "name": "sheetpurple-equipped-BACKPACK", + "name": "sheetpurple-equipped-NECK", "directions": 4, "delays": [ [ @@ -418,7 +418,7 @@ ] }, { - "name": "sheetqm-equipped-BACKPACK", + "name": "sheetqm-equipped-NECK", "directions": 4, "delays": [ [ @@ -436,7 +436,7 @@ ] }, { - "name": "sheetrainbow-equipped-BACKPACK", + "name": "sheetrainbow-equipped-NECK", "directions": 4, "delays": [ [ @@ -454,7 +454,7 @@ ] }, { - "name": "sheetrd-equipped-BACKPACK", + "name": "sheetrd-equipped-NECK", "directions": 4, "delays": [ [ @@ -472,7 +472,7 @@ ] }, { - "name": "sheetred-equipped-BACKPACK", + "name": "sheetred-equipped-NECK", "directions": 4, "delays": [ [ @@ -490,7 +490,7 @@ ] }, { - "name": "sheetsyndie-equipped-BACKPACK", + "name": "sheetsyndie-equipped-NECK", "directions": 4, "delays": [ [ @@ -508,7 +508,7 @@ ] }, { - "name": "sheetwhite-equipped-BACKPACK", + "name": "sheetwhite-equipped-NECK", "directions": 4, "delays": [ [ @@ -526,7 +526,7 @@ ] }, { - "name": "sheetwiz-equipped-BACKPACK", + "name": "sheetwiz-equipped-NECK", "directions": 4, "delays": [ [ @@ -556,7 +556,7 @@ ] }, { - "name": "sheetyellow-equipped-BACKPACK", + "name": "sheetyellow-equipped-NECK", "directions": 4, "delays": [ [ @@ -1604,6 +1604,336 @@ 1 ] ] + }, + { + "name": "bling-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "redtie-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stethoscope-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedbluescarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedredscarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "stripedgreenscarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "zebrascarf-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "dettie-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_on-equipped-NECK", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "headphones_off-equipped-NECK", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_on-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "headphones_on-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "bling", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "stripedgreenscarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "stripedbluescarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "stripedredscarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "zebrascarf", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "stethoscope", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "dettie", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "redtie", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "headphones_off", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "headphones_on", + "directions": 1, + "delays": [ + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png new file mode 100644 index 0000000000..45a4c147fc Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/redtie-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/redtie.png b/Resources/Textures/Clothing/neck.rsi/redtie.png new file mode 100644 index 0000000000..5d94099779 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/redtie.png differ diff --git a/Resources/Textures/Clothing/back.rsi/sheetNT-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetNT-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetNT-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetNT-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetNT-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetNT-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetNT-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetNT-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetNT-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetUSA-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetUSA-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetUSA-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetUSA-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetUSA-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetUSA-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetUSA-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetUSA-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetUSA-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblack-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetblack-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblack-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetblack-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblack-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblack-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblack-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblack-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetblack-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblue-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetblue-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblue-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetblue-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblue-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblue-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetblue-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetblue-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetblue-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetbrown-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetbrown-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetbrown-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetbrown-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetbrown-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetbrown-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetbrown-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetbrown-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetbrown-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcaptain-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcaptain-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcaptain-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcaptain-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcaptain-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcaptain-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcaptain-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcaptain-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcaptain-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetce-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetce-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetce-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetce-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetce-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetce-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetce-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetce-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetce-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetce-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetce-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetce-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcentcom-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcentcom-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcentcom-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcentcom-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcentcom-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcentcom-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcentcom-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcentcom-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcentcom-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetclown-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetclown-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetclown-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetclown-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcmo-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcmo-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcmo-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcmo-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcmo-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcmo-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcmo-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcmo-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcmo-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcosmos-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcosmos-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcosmos-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcosmos-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcosmos-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcosmos-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcosmos-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcosmos-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcosmos-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcult-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetcult-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcult-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetcult-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcult-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcult-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetcult-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetcult-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetcult-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgreen-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetgreen-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgreen-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetgreen-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgreen-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgreen-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgreen-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgreen-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetgreen-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgrey-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetgrey-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgrey-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetgrey-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgrey-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgrey-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetgrey-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetgrey-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetgrey-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethop-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheethop-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethop-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheethop-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethop-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheethop-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethop-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheethop-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethop-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheethop-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethop-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheethop-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethos-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheethos-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethos-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheethos-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethos-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheethos-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethos-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheethos-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheethos-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheethos-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheethos-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheethos-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetian-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetian-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetian-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetian-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetian-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetian-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetian-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetian-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetian-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetian-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetian-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetian-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmedical-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetmedical-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmedical-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetmedical-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmedical-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmedical-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmedical-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmedical-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetmedical-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmime-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetmime-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmime-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetmime-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmime-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmime-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetmime-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetmime-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetmime-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetorange-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetorange-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetorange-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetorange-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetorange-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetorange-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetorange-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetorange-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetorange-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetpurple-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetpurple-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetpurple-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetpurple-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetpurple-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetpurple-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetpurple-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetpurple-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetpurple-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetqm-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetqm-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetqm-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetqm-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetqm-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetqm-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetqm-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetqm-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetqm-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrainbow-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetrainbow-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrainbow-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetrainbow-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrainbow-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrainbow-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrainbow-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrainbow-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetrainbow-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrd-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetrd-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrd-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetrd-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrd-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrd-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetrd-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetrd-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetrd-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetred-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetred-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetred-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetred-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetred-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetred-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetred-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetred-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetred-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetred-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetred-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetred-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetsyndie-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetsyndie-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetsyndie-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetsyndie-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetsyndie-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetsyndie-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetsyndie-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetsyndie-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetsyndie-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwhite-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetwhite-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwhite-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetwhite-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwhite-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwhite-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwhite-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwhite-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetwhite-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwiz-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetwiz-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwiz-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetwiz-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwiz-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwiz-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetwiz-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetwiz-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetwiz-inhand-right.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetyellow-equipped-BACKPACK.png b/Resources/Textures/Clothing/neck.rsi/sheetyellow-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetyellow-equipped-BACKPACK.png rename to Resources/Textures/Clothing/neck.rsi/sheetyellow-equipped-NECK.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetyellow-inhand-left.png b/Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetyellow-inhand-left.png rename to Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-left.png diff --git a/Resources/Textures/Clothing/back.rsi/sheetyellow-inhand-right.png b/Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/back.rsi/sheetyellow-inhand-right.png rename to Resources/Textures/Clothing/neck.rsi/sheetyellow-inhand-right.png diff --git a/Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png new file mode 100644 index 0000000000..22693b4ae3 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stethoscope-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stethoscope.png b/Resources/Textures/Clothing/neck.rsi/stethoscope.png new file mode 100644 index 0000000000..d4d03ad198 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stethoscope.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png new file mode 100644 index 0000000000..e0c1bee72d Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png new file mode 100644 index 0000000000..962d0cb48c Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedbluescarf.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png new file mode 100644 index 0000000000..b626538c2a Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png b/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png new file mode 100644 index 0000000000..89d303ab02 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedgreenscarf.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png new file mode 100644 index 0000000000..c9b543450a Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedredscarf-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/stripedredscarf.png b/Resources/Textures/Clothing/neck.rsi/stripedredscarf.png new file mode 100644 index 0000000000..1e8ed9ee80 Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/stripedredscarf.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png b/Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png new file mode 100644 index 0000000000..5a0e5d6c7b Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/zebrascarf-equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/neck.rsi/zebrascarf.png b/Resources/Textures/Clothing/neck.rsi/zebrascarf.png new file mode 100644 index 0000000000..08b12b353b Binary files /dev/null and b/Resources/Textures/Clothing/neck.rsi/zebrascarf.png differ diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/fist.png b/Resources/Textures/Effects/weapons/arcs.rsi/fist.png new file mode 100644 index 0000000000..337d57adc2 Binary files /dev/null and b/Resources/Textures/Effects/weapons/arcs.rsi/fist.png differ diff --git a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json index d9ae4e1a8d..6b8951dec8 100644 --- a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json +++ b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "slash", "directions": 1 + }, + { + "name": "fist", + "directions": 1 } ] } diff --git a/Resources/Textures/Objects/Food/milkape.rsi/icon.png b/Resources/Textures/Objects/Food/milkape.rsi/icon.png new file mode 100644 index 0000000000..664a3dfa3e Binary files /dev/null and b/Resources/Textures/Objects/Food/milkape.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Food/milkape.rsi/meta.json b/Resources/Textures/Objects/Food/milkape.rsi/meta.json new file mode 100644 index 0000000000..8aa4c1e799 --- /dev/null +++ b/Resources/Textures/Objects/Food/milkape.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", "states": [{"name": "icon", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Grenades/flashbang.rsi/icon.png b/Resources/Textures/Objects/Grenades/flashbang.rsi/icon.png new file mode 100644 index 0000000000..aec9818274 Binary files /dev/null and b/Resources/Textures/Objects/Grenades/flashbang.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Grenades/flashbang.rsi/meta.json b/Resources/Textures/Objects/Grenades/flashbang.rsi/meta.json new file mode 100644 index 0000000000..e78576c6fe --- /dev/null +++ b/Resources/Textures/Objects/Grenades/flashbang.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/raw/6d8ea1e75ccbd236230b2ed71b6e0bf16d41fc09/icons/obj/grenade.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "primed", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Grenades/flashbang.rsi/primed.png b/Resources/Textures/Objects/Grenades/flashbang.rsi/primed.png new file mode 100644 index 0000000000..596bfb6a15 Binary files /dev/null and b/Resources/Textures/Objects/Grenades/flashbang.rsi/primed.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-0.png deleted file mode 100644 index 2a5fce2229..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-1.png deleted file mode 100644 index 1926376d6a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash.png deleted file mode 100644 index 1926376d6a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/meta.json deleted file mode 100644 index 2fd809ce0c..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box32-flash", "directions": 1}, {"name": "box32-flash-0", "directions": 1}, {"name": "box32-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-0.png deleted file mode 100644 index 6b03d237da..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-1.png deleted file mode 100644 index e5f6c8fba7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv.png deleted file mode 100644 index e5f6c8fba7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/meta.json deleted file mode 100644 index 8674ce8fc9..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box32-hv", "directions": 1}, {"name": "box32-hv-0", "directions": 1}, {"name": "box32-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-0.png deleted file mode 100644 index ec41d1a81f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-1.png deleted file mode 100644 index 18653cb207..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice.png deleted file mode 100644 index 18653cb207..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/meta.json deleted file mode 100644 index 88da33c31f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box32-practice", "directions": 1}, {"name": "box32-practice-0", "directions": 1}, {"name": "box32-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-0.png deleted file mode 100644 index 2ca3a79259..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-1.png deleted file mode 100644 index cb8a634fcb..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber.png deleted file mode 100644 index cb8a634fcb..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/meta.json deleted file mode 100644 index 6ed2c59d85..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box32-rubber", "directions": 1}, {"name": "box32-rubber-0", "directions": 1}, {"name": "box32-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32-0.png deleted file mode 100644 index 7056cb7020..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32-1.png deleted file mode 100644 index 2eee49a3a6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32.png deleted file mode 100644 index 2eee49a3a6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/meta.json deleted file mode 100644 index 59583eb93d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box32", "directions": 1}, {"name": "box32-0", "directions": 1}, {"name": "box32-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash.png deleted file mode 100644 index 43b716d1b6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/meta.json deleted file mode 100644 index 74416c04bb..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box357-flash", "directions": 1}, {"name": "box357-flash-0", "directions": 1}, {"name": "box357-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv.png deleted file mode 100644 index 3231de5d90..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/meta.json deleted file mode 100644 index 6f85c5d64c..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box357-hv", "directions": 1}, {"name": "box357-hv-0", "directions": 1}, {"name": "box357-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice.png deleted file mode 100644 index b927c72ad0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/meta.json deleted file mode 100644 index 6b76fbc8b4..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box357-practice", "directions": 1}, {"name": "box357-practice-0", "directions": 1}, {"name": "box357-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber.png deleted file mode 100644 index 69d6ebeb63..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/meta.json deleted file mode 100644 index b7d953ebd5..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box357-rubber", "directions": 1}, {"name": "box357-rubber-0", "directions": 1}, {"name": "box357-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357.png deleted file mode 100644 index 836bafb067..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/meta.json deleted file mode 100644 index d4af10b7e1..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box357", "directions": 1}, {"name": "box357-0", "directions": 1}, {"name": "box357-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash.png deleted file mode 100644 index cd17ee8a38..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/meta.json deleted file mode 100644 index a84e5636b4..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box44-flash", "directions": 1}, {"name": "box44-flash-0", "directions": 1}, {"name": "box44-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv.png deleted file mode 100644 index ed485e993a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/meta.json deleted file mode 100644 index d0c396314f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box44-hv", "directions": 1}, {"name": "box44-hv-0", "directions": 1}, {"name": "box44-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice.png deleted file mode 100644 index 413750bcf9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/meta.json deleted file mode 100644 index 8852e43751..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box44-practice", "directions": 1}, {"name": "box44-practice-0", "directions": 1}, {"name": "box44-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber.png deleted file mode 100644 index 6de8be102a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/meta.json deleted file mode 100644 index 2ec1da20c0..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box44-rubber", "directions": 1}, {"name": "box44-rubber-0", "directions": 1}, {"name": "box44-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44.png deleted file mode 100644 index a36da3f38c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/meta.json deleted file mode 100644 index f76b4efc13..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box44", "directions": 1}, {"name": "box44-0", "directions": 1}, {"name": "box44-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-0.png deleted file mode 100644 index e9c470da94..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-1.png deleted file mode 100644 index dab0167c65..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash.png deleted file mode 100644 index dab0167c65..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/meta.json deleted file mode 100644 index 3a7cab3cdb..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box45-flash", "directions": 1}, {"name": "box45-flash-0", "directions": 1}, {"name": "box45-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice.png deleted file mode 100644 index 4d6507596c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/meta.json deleted file mode 100644 index d1d9a3e821..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box45-practice", "directions": 1}, {"name": "box45-practice-0", "directions": 1}, {"name": "box45-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber.png deleted file mode 100644 index ecbc57cf2f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/meta.json deleted file mode 100644 index 562a647cdc..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box45-rubber", "directions": 1}, {"name": "box45-rubber-0", "directions": 1}, {"name": "box45-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45.png deleted file mode 100644 index 0d5caad0fe..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/meta.json deleted file mode 100644 index 6acb5163d0..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box45", "directions": 1}, {"name": "box45-0", "directions": 1}, {"name": "box45-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash-0.png deleted file mode 100644 index a9fb864313..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash-1.png deleted file mode 100644 index 06841b0c6a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash.png deleted file mode 100644 index 06841b0c6a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/meta.json deleted file mode 100644 index 788923bc3a..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box50-flash", "directions": 1}, {"name": "box50-flash-0", "directions": 1}, {"name": "box50-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-0.png deleted file mode 100644 index f2019f98b6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-1.png deleted file mode 100644 index 561b152c6d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv.png deleted file mode 100644 index 561b152c6d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/meta.json deleted file mode 100644 index e6d51dea12..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box50-hv", "directions": 1}, {"name": "box50-hv-0", "directions": 1}, {"name": "box50-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-0.png deleted file mode 100644 index ff4f04cfb1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-1.png deleted file mode 100644 index 1872d4d7ad..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice.png deleted file mode 100644 index 1872d4d7ad..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/meta.json deleted file mode 100644 index 95f87e255c..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box50-practice", "directions": 1}, {"name": "box50-practice-0", "directions": 1}, {"name": "box50-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-0.png deleted file mode 100644 index e9b3183982..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-1.png deleted file mode 100644 index a90f75cfde..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber.png deleted file mode 100644 index a90f75cfde..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/meta.json deleted file mode 100644 index 9689ae8211..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box50-rubber", "directions": 1}, {"name": "box50-rubber-0", "directions": 1}, {"name": "box50-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50-0.png deleted file mode 100644 index c97cd964be..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50-1.png deleted file mode 100644 index 06afc3c31e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50.png deleted file mode 100644 index 06afc3c31e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/meta.json deleted file mode 100644 index 0590703256..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box50", "directions": 1}, {"name": "box50-0", "directions": 1}, {"name": "box50-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash.png deleted file mode 100644 index 7bfc5530f3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/meta.json deleted file mode 100644 index 1ea0863848..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10mm-flash", "directions": 1}, {"name": "box10mm-flash-0", "directions": 1}, {"name": "box10mm-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv.png deleted file mode 100644 index 6bda43eb64..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/meta.json deleted file mode 100644 index 3e575f4308..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10mm-hv", "directions": 1}, {"name": "box10mm-hv-0", "directions": 1}, {"name": "box10mm-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice.png deleted file mode 100644 index 92e514c351..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/meta.json deleted file mode 100644 index 9174c59d4d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10mm-practice", "directions": 1}, {"name": "box10mm-practice-0", "directions": 1}, {"name": "box10mm-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber.png deleted file mode 100644 index eb460e4e00..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/meta.json deleted file mode 100644 index 07f7d048ac..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10mm-rubber", "directions": 1}, {"name": "box10mm-rubber-0", "directions": 1}, {"name": "box10mm-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm.png deleted file mode 100644 index d864a73b1b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/meta.json deleted file mode 100644 index bd20ae4a01..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10mm", "directions": 1}, {"name": "box10mm-0", "directions": 1}, {"name": "box10mm-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24.png deleted file mode 100644 index 26ed4ff109..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/meta.json deleted file mode 100644 index 7ee1067450..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10x24", "directions": 1}, {"name": "box10x24-0", "directions": 1}, {"name": "box10x24-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice.png deleted file mode 100644 index 90ccd7de5c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/meta.json deleted file mode 100644 index f72c8a82b7..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box556mm-practice", "directions": 1}, {"name": "box556mm-practice-0", "directions": 1}, {"name": "box556mm-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm.png deleted file mode 100644 index bedb1d82a1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/meta.json deleted file mode 100644 index 27f15c101e..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box556mm", "directions": 1}, {"name": "box556mm-0", "directions": 1}, {"name": "box556mm-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber.png deleted file mode 100644 index ac5b51bebf..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/meta.json deleted file mode 100644 index 739cc4f8c4..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box65mm-rubber", "directions": 1}, {"name": "box65mm-rubber-0", "directions": 1}, {"name": "box65mm-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm.png deleted file mode 100644 index 7d4c64d7f4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/meta.json deleted file mode 100644 index 12da7e8a18..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box65mm", "directions": 1}, {"name": "box65mm-0", "directions": 1}, {"name": "box65mm-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm.png deleted file mode 100644 index 3b2fa0a3f1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/meta.json deleted file mode 100644 index 9ebf754c6e..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box762mm", "directions": 1}, {"name": "box762mm-0", "directions": 1}, {"name": "box762mm-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash.png deleted file mode 100644 index ebb397a6bf..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/meta.json deleted file mode 100644 index 4aaac4563d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm-flash", "directions": 1}, {"name": "box9mm-flash-0", "directions": 1}, {"name": "box9mm-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv.png deleted file mode 100644 index 765d4154c4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/meta.json deleted file mode 100644 index d8280fafdd..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm-hv", "directions": 1}, {"name": "box9mm-hv-0", "directions": 1}, {"name": "box9mm-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice.png deleted file mode 100644 index 3598ef7c9a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/meta.json deleted file mode 100644 index 2fa4a9ca9b..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm-practice", "directions": 1}, {"name": "box9mm-practice-0", "directions": 1}, {"name": "box9mm-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber.png deleted file mode 100644 index 8e077f7615..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/meta.json deleted file mode 100644 index aa73b23a21..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm-rubber", "directions": 1}, {"name": "box9mm-rubber-0", "directions": 1}, {"name": "box9mm-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm.png deleted file mode 100644 index 59f8dc24f7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/meta.json deleted file mode 100644 index 78082924c8..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm", "directions": 1}, {"name": "box9mm-0", "directions": 1}, {"name": "box9mm-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/base.png new file mode 100644 index 0000000000..1bc6823aba Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/icon.png new file mode 100644 index 0000000000..d837a9003b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/mag-1.png new file mode 100644 index 0000000000..3ff1180051 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/meta.json new file mode 100644 index 0000000000..40000b4fb0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/mag-1.png new file mode 100644 index 0000000000..da73a5f853 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/mag-1.png new file mode 100644 index 0000000000..6a77161ab2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/meta.json new file mode 100644 index 0000000000..40000b4fb0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..6a77161ab2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/meta.json new file mode 100644 index 0000000000..40000b4fb0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/mag-1.png new file mode 100644 index 0000000000..edcbdbd385 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/mag-1.png new file mode 100644 index 0000000000..edcbdbd385 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/mag-1.png new file mode 100644 index 0000000000..edcbdbd385 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/mag-1.png new file mode 100644 index 0000000000..edcbdbd385 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..edcbdbd385 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/mag-1.png new file mode 100644 index 0000000000..7fbc8f50ac Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/meta.json new file mode 100644 index 0000000000..40000b4fb0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/mag-1.png new file mode 100644 index 0000000000..a6feb95c36 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/meta.json new file mode 100644 index 0000000000..40000b4fb0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/base.png new file mode 100644 index 0000000000..6a4ebbc268 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/icon.png new file mode 100644 index 0000000000..87d0f755da Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/mag-1.png new file mode 100644 index 0000000000..a6feb95c36 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/meta.json new file mode 100644 index 0000000000..40000b4fb0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/mag-1.png new file mode 100644 index 0000000000..a6feb95c36 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/meta.json new file mode 100644 index 0000000000..40000b4fb0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..a6feb95c36 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/meta.json new file mode 100644 index 0000000000..40000b4fb0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/mag-1.png new file mode 100644 index 0000000000..dbc1078dd9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/mag-1.png new file mode 100644 index 0000000000..dbc1078dd9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/mag-1.png new file mode 100644 index 0000000000..dbc1078dd9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/mag-1.png new file mode 100644 index 0000000000..dbc1078dd9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..dbc1078dd9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/mag-1.png new file mode 100644 index 0000000000..f32f686266 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/mag-1.png new file mode 100644 index 0000000000..f32f686266 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/mag-1.png new file mode 100644 index 0000000000..f32f686266 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/mag-1.png new file mode 100644 index 0000000000..f32f686266 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..f32f686266 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/mag-1.png new file mode 100644 index 0000000000..a3d15b76e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..a3d15b76e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/mag-1.png new file mode 100644 index 0000000000..2d9e2d767f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/mag-1.png new file mode 100644 index 0000000000..2d9e2d767f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/mag-1.png new file mode 100644 index 0000000000..2d9e2d767f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/mag-1.png new file mode 100644 index 0000000000..2d9e2d767f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/meta.json new file mode 100644 index 0000000000..be1e92d993 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..2d9e2d767f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/meta.json new file mode 100644 index 0000000000..34908262bb --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "icon", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json new file mode 100644 index 0000000000..b27dd8d3a3 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi", + "states": [ + { + "name": "s-casing", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/ammo_casing.rsi/s-casing.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/ammo_casing.rsi/s-casing.png new file mode 100644 index 0000000000..79cac80355 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/ammo_casing.rsi/s-casing.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/base.png new file mode 100644 index 0000000000..a1e6359027 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/meta.json new file mode 100644 index 0000000000..4f4121d24a --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/8a848cde3e8610455f77704e861e5a06315a3b0e/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/spent.png new file mode 100644 index 0000000000..26c1a1f2e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/large_casing.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/rocket_shell.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/rocket_shell.rsi/base.png new file mode 100644 index 0000000000..5b0c42d8c7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/rocket_shell.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json new file mode 100644 index 0000000000..53f2cfab01 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png new file mode 100644 index 0000000000..f3ae457fe6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/spent.png new file mode 100644 index 0000000000..c6f01ff6a3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/base.png new file mode 100644 index 0000000000..01aa3bcd82 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/meta.json new file mode 100644 index 0000000000..d134798630 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/79b16e252e29d5a223a2b928fba25e2e6f9644ee/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/spent.png new file mode 100644 index 0000000000..d6a0429b66 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/base.png new file mode 100644 index 0000000000..ab0c6ae7fa Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/base.png new file mode 100644 index 0000000000..01aa3bcd82 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/spent.png new file mode 100644 index 0000000000..d6a0429b66 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/spent.png new file mode 100644 index 0000000000..96aeeb5e16 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/base.png new file mode 100644 index 0000000000..e0810018b8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/spent.png new file mode 100644 index 0000000000..075ef807e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png new file mode 100644 index 0000000000..88d79fd0dc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png new file mode 100644 index 0000000000..21cbe68028 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/base.png new file mode 100644 index 0000000000..5932736342 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/spent.png new file mode 100644 index 0000000000..fd5853a585 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/base.png new file mode 100644 index 0000000000..07455f041c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/spent.png new file mode 100644 index 0000000000..9ffacd7ef0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/base.png new file mode 100644 index 0000000000..2c20f418e2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/meta.json new file mode 100644 index 0000000000..d134798630 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/79b16e252e29d5a223a2b928fba25e2e6f9644ee/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/spent.png new file mode 100644 index 0000000000..d770bca840 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_baton.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/base.png new file mode 100644 index 0000000000..2ad0feea99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/spent.png new file mode 100644 index 0000000000..d770bca840 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_blast.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/base.png new file mode 100644 index 0000000000..ea4ac075e2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/spent.png new file mode 100644 index 0000000000..d770bca840 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_flash.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/base.png new file mode 100644 index 0000000000..c504fe4ad8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/meta.json new file mode 100644 index 0000000000..6a22b562fa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", + "states": [ + { + "name": "base", + "directions": 1 + }, + { + "name": "spent", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/spent.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/spent.png new file mode 100644 index 0000000000..d770bca840 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/grenade_frag.rsi/spent.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/rpg.rsi/frag.png b/Resources/Textures/Objects/Guns/Ammunition/Explosives/rpg.rsi/frag.png new file mode 100644 index 0000000000..5b0c42d8c7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Explosives/rpg.rsi/frag.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Explosives/rpg.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Explosives/rpg.rsi/meta.json new file mode 100644 index 0000000000..310a348520 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Explosives/rpg.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma-0.png deleted file mode 100644 index 4e77690512..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma-1.png deleted file mode 100644 index ccfd6a4288..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma.png deleted file mode 100644 index ccfd6a4288..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/meta.json deleted file mode 100644 index 6de6c882a1..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "32trauma-1", "directions": 1}, {"name": "32trauma-0", "directions": 1}, {"name": "32trauma", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f-0.png deleted file mode 100644 index 7367fad832..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f-1.png deleted file mode 100644 index 9488bdbc29..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f.png deleted file mode 100644 index 9488bdbc29..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/meta.json deleted file mode 100644 index 0982e1e668..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "32trauma_f-1", "directions": 1}, {"name": "32trauma_f-0", "directions": 1}, {"name": "32trauma_f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv-0.png deleted file mode 100644 index 2ddc4c714f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv-1.png deleted file mode 100644 index 19ec7b8ece..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv.png deleted file mode 100644 index 19ec7b8ece..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/meta.json deleted file mode 100644 index f8445be71f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "32trauma_hv-1", "directions": 1}, {"name": "32trauma_hv-0", "directions": 1}, {"name": "32trauma_hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l-0.png deleted file mode 100644 index 8f2b28b411..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l-1.png deleted file mode 100644 index db31de3786..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l.png deleted file mode 100644 index db31de3786..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/meta.json deleted file mode 100644 index 9f2df46e39..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "32trauma_l-1", "directions": 1}, {"name": "32trauma_l-0", "directions": 1}, {"name": "32trauma_l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p-0.png deleted file mode 100644 index 0d9f92b4b7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p-1.png deleted file mode 100644 index de268dbfa9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p.png deleted file mode 100644 index de268dbfa9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/meta.json deleted file mode 100644 index 5160102f6f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "32trauma_p-1", "directions": 1}, {"name": "32trauma_p-0", "directions": 1}, {"name": "32trauma_p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r-0.png deleted file mode 100644 index a5671ec3e0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r-1.png deleted file mode 100644 index a5d56f600c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r.png deleted file mode 100644 index a5d56f600c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/meta.json deleted file mode 100644 index 1591e70d2b..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "32trauma_r-1", "directions": 1}, {"name": "32trauma_r-0", "directions": 1}, {"name": "32trauma_r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/meta.json deleted file mode 100644 index 54dc96cb6c..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_pst_44-1", "directions": 1}, {"name": "mg_ih_pst_44-5", "directions": 1}, {"name": "mg_ih_pst_44-4", "directions": 1}, {"name": "mg_ih_pst_44-3", "directions": 1}, {"name": "mg_ih_pst_44-2", "directions": 1}, {"name": "mg_ih_pst_44-0", "directions": 1}, {"name": "mg_ih_pst_44", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-2.png deleted file mode 100644 index 3de351fff7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-3.png deleted file mode 100644 index cd21b85fd6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-4.png deleted file mode 100644 index 38fc6bd080..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-5.png deleted file mode 100644 index f24d1ee664..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44.png deleted file mode 100644 index f24d1ee664..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/meta.json deleted file mode 100644 index 9e1c452c2d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_pst_44f-1", "directions": 1}, {"name": "mg_ih_pst_44f-5", "directions": 1}, {"name": "mg_ih_pst_44f-4", "directions": 1}, {"name": "mg_ih_pst_44f-3", "directions": 1}, {"name": "mg_ih_pst_44f-2", "directions": 1}, {"name": "mg_ih_pst_44f-0", "directions": 1}, {"name": "mg_ih_pst_44f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-2.png deleted file mode 100644 index 442ef75ff2..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-3.png deleted file mode 100644 index 0cd3e2c2f6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-4.png deleted file mode 100644 index 0ee8ae8436..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-5.png deleted file mode 100644 index f2c1287b44..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f.png deleted file mode 100644 index f2c1287b44..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/meta.json deleted file mode 100644 index bd617ec7d8..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_pst_44hv-1", "directions": 1}, {"name": "mg_ih_pst_44hv-5", "directions": 1}, {"name": "mg_ih_pst_44hv-4", "directions": 1}, {"name": "mg_ih_pst_44hv-3", "directions": 1}, {"name": "mg_ih_pst_44hv-2", "directions": 1}, {"name": "mg_ih_pst_44hv-0", "directions": 1}, {"name": "mg_ih_pst_44hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-2.png deleted file mode 100644 index 8194d6ec6f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-3.png deleted file mode 100644 index b1b4b8f25a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-4.png deleted file mode 100644 index e227f0da2a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-5.png deleted file mode 100644 index 8bc32081cd..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv.png deleted file mode 100644 index 8bc32081cd..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/meta.json deleted file mode 100644 index 3e4c2341af..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_pst_44l-1", "directions": 1}, {"name": "mg_ih_pst_44l-5", "directions": 1}, {"name": "mg_ih_pst_44l-4", "directions": 1}, {"name": "mg_ih_pst_44l-3", "directions": 1}, {"name": "mg_ih_pst_44l-2", "directions": 1}, {"name": "mg_ih_pst_44l-0", "directions": 1}, {"name": "mg_ih_pst_44l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-2.png deleted file mode 100644 index f2a8f04c30..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-3.png deleted file mode 100644 index 1d5de735a7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-4.png deleted file mode 100644 index 6fb955ec8b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-5.png deleted file mode 100644 index 359b461ec3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l.png deleted file mode 100644 index 359b461ec3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/meta.json deleted file mode 100644 index 5f936e3af7..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_pst_44p-1", "directions": 1}, {"name": "mg_ih_pst_44p-5", "directions": 1}, {"name": "mg_ih_pst_44p-4", "directions": 1}, {"name": "mg_ih_pst_44p-3", "directions": 1}, {"name": "mg_ih_pst_44p-2", "directions": 1}, {"name": "mg_ih_pst_44p-0", "directions": 1}, {"name": "mg_ih_pst_44p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-2.png deleted file mode 100644 index b51421fb37..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-3.png deleted file mode 100644 index 7083ff842d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-4.png deleted file mode 100644 index 35a75fd1c3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-5.png deleted file mode 100644 index afdb4dfb17..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p.png deleted file mode 100644 index afdb4dfb17..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/meta.json deleted file mode 100644 index b9976cace2..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_pst_44r-1", "directions": 1}, {"name": "mg_ih_pst_44r-5", "directions": 1}, {"name": "mg_ih_pst_44r-4", "directions": 1}, {"name": "mg_ih_pst_44r-3", "directions": 1}, {"name": "mg_ih_pst_44r-2", "directions": 1}, {"name": "mg_ih_pst_44r-0", "directions": 1}, {"name": "mg_ih_pst_44r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-2.png deleted file mode 100644 index 31a2f0b154..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-3.png deleted file mode 100644 index 6249190197..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-4.png deleted file mode 100644 index f814d16045..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-5.png deleted file mode 100644 index 21a6d3f640..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r.png deleted file mode 100644 index 21a6d3f640..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-1.png deleted file mode 100644 index f9c4c1c4f0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-3.png deleted file mode 100644 index f9c4c1c4f0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-4.png deleted file mode 100644 index 2f705c43c0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-5.png deleted file mode 100644 index e62fb28867..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-6.png deleted file mode 100644 index db5021b415..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-7.png deleted file mode 100644 index dd2b64e3d3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45.png deleted file mode 100644 index 5cb13dd32d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/meta.json deleted file mode 100644 index 0f566cb841..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "45-2", "directions": 1}, {"name": "45-8", "directions": 1}, {"name": "45-7", "directions": 1}, {"name": "45-6", "directions": 1}, {"name": "45-5", "directions": 1}, {"name": "45-4", "directions": 1}, {"name": "45-3", "directions": 1}, {"name": "45-1", "directions": 1}, {"name": "45-0", "directions": 1}, {"name": "45", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-1.png deleted file mode 100644 index e0efb7fb39..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-3.png deleted file mode 100644 index e0efb7fb39..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-4.png deleted file mode 100644 index a4a55205d1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-5.png deleted file mode 100644 index fba4e4b540..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-6.png deleted file mode 100644 index 1d0f640135..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-7.png deleted file mode 100644 index bf36bedb2c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-8.png deleted file mode 100644 index fae421fb5f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-8.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f.png deleted file mode 100644 index fae421fb5f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/meta.json deleted file mode 100644 index f1cf0bee3d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "45f-2", "directions": 1}, {"name": "45f-8", "directions": 1}, {"name": "45f-7", "directions": 1}, {"name": "45f-6", "directions": 1}, {"name": "45f-5", "directions": 1}, {"name": "45f-4", "directions": 1}, {"name": "45f-3", "directions": 1}, {"name": "45f-1", "directions": 1}, {"name": "45f-0", "directions": 1}, {"name": "45f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-1.png deleted file mode 100644 index 074f2d8f22..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-3.png deleted file mode 100644 index 074f2d8f22..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-4.png deleted file mode 100644 index 51e9f7a3fd..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-5.png deleted file mode 100644 index feb710b39a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-6.png deleted file mode 100644 index 5edba2c3b0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-7.png deleted file mode 100644 index c3f4d9f52c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv.png deleted file mode 100644 index 64d5b7f216..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/meta.json deleted file mode 100644 index 0be587af35..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "45hv-2", "directions": 1}, {"name": "45hv-8", "directions": 1}, {"name": "45hv-7", "directions": 1}, {"name": "45hv-6", "directions": 1}, {"name": "45hv-5", "directions": 1}, {"name": "45hv-4", "directions": 1}, {"name": "45hv-3", "directions": 1}, {"name": "45hv-1", "directions": 1}, {"name": "45hv-0", "directions": 1}, {"name": "45hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-1.png deleted file mode 100644 index 649fae4ab5..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-3.png deleted file mode 100644 index 649fae4ab5..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-4.png deleted file mode 100644 index 7a93907827..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-5.png deleted file mode 100644 index 9acb1d68ce..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-6.png deleted file mode 100644 index 94ea756dcd..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-7.png deleted file mode 100644 index 6ddeac1e7b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l.png deleted file mode 100644 index f6d42a0402..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/meta.json deleted file mode 100644 index 7bb562858f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "45l-2", "directions": 1}, {"name": "45l-8", "directions": 1}, {"name": "45l-7", "directions": 1}, {"name": "45l-6", "directions": 1}, {"name": "45l-5", "directions": 1}, {"name": "45l-4", "directions": 1}, {"name": "45l-3", "directions": 1}, {"name": "45l-1", "directions": 1}, {"name": "45l-0", "directions": 1}, {"name": "45l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-1.png deleted file mode 100644 index a653b45ac9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-3.png deleted file mode 100644 index a653b45ac9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-4.png deleted file mode 100644 index 38579d682e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-5.png deleted file mode 100644 index 42ecaddd7f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-6.png deleted file mode 100644 index 4654af6419..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-7.png deleted file mode 100644 index f21cc36266..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p.png deleted file mode 100644 index ff09f2eb79..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/meta.json deleted file mode 100644 index 415f2206a9..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "45p-2", "directions": 1}, {"name": "45p-8", "directions": 1}, {"name": "45p-7", "directions": 1}, {"name": "45p-6", "directions": 1}, {"name": "45p-5", "directions": 1}, {"name": "45p-4", "directions": 1}, {"name": "45p-3", "directions": 1}, {"name": "45p-1", "directions": 1}, {"name": "45p-0", "directions": 1}, {"name": "45p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-1.png deleted file mode 100644 index 181b5ad647..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-3.png deleted file mode 100644 index 181b5ad647..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-4.png deleted file mode 100644 index 4bc8517be2..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-5.png deleted file mode 100644 index 6d8d2b19ab..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-6.png deleted file mode 100644 index 5481a4ce15..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-7.png deleted file mode 100644 index a02b592a69..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r.png deleted file mode 100644 index 681af36b78..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/meta.json deleted file mode 100644 index 31b0bb7d0d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "45r-2", "directions": 1}, {"name": "45r-8", "directions": 1}, {"name": "45r-7", "directions": 1}, {"name": "45r-6", "directions": 1}, {"name": "45r-5", "directions": 1}, {"name": "45r-4", "directions": 1}, {"name": "45r-3", "directions": 1}, {"name": "45r-1", "directions": 1}, {"name": "45r-0", "directions": 1}, {"name": "45r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/meta.json deleted file mode 100644 index 413c6df5e6..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg45-1", "directions": 1}, {"name": "smg45-0", "directions": 1}, {"name": "smg45", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45-0.png deleted file mode 100644 index cf7da81ee6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45-1.png deleted file mode 100644 index 14d567434c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45.png deleted file mode 100644 index 14d567434c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/meta.json deleted file mode 100644 index 4e993663d2..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg45f-2", "directions": 1}, {"name": "smg45f-0", "directions": 1}, {"name": "smg45f-1", "directions": 1}, {"name": "smg45f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-0.png deleted file mode 100644 index 270e6c8890..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-1.png deleted file mode 100644 index f4d98be55b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-2.png deleted file mode 100644 index bb8f9547a3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f.png deleted file mode 100644 index bb8f9547a3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/meta.json deleted file mode 100644 index ac3b0d0001..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg45hv-1", "directions": 1}, {"name": "smg45hv-0", "directions": 1}, {"name": "smg45hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv-0.png deleted file mode 100644 index d2a06377ac..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv-1.png deleted file mode 100644 index e3ae30e182..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv.png deleted file mode 100644 index e3ae30e182..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/meta.json deleted file mode 100644 index 1bda2c7746..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg45l-1", "directions": 1}, {"name": "smg45l-0", "directions": 1}, {"name": "smg45l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l-0.png deleted file mode 100644 index 3523d2b8b6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l-1.png deleted file mode 100644 index 64f7fe1753..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l.png deleted file mode 100644 index 64f7fe1753..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/meta.json deleted file mode 100644 index 9abe1c1939..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg45p-0", "directions": 1}, {"name": "smg45p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/smg45p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/smg45p-0.png deleted file mode 100644 index 5d0ccec4a7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/smg45p-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/smg45p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/smg45p.png deleted file mode 100644 index 5d0ccec4a7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/smg45p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/meta.json deleted file mode 100644 index bb96db5ea2..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg45r-1", "directions": 1}, {"name": "smg45r-0", "directions": 1}, {"name": "smg45r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r-0.png deleted file mode 100644 index 31b1071aee..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r-1.png deleted file mode 100644 index 71610cf542..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r.png deleted file mode 100644 index 71610cf542..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-1.png deleted file mode 100644 index 5cb13dd32d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/meta.json deleted file mode 100644 index ef2c2f5695..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "50ae-1", "directions": 1}, {"name": "50ae-0", "directions": 1}, {"name": "50ae", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef-0.png deleted file mode 100644 index 7910e3ea7f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef-1.png deleted file mode 100644 index fae421fb5f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef.png deleted file mode 100644 index fae421fb5f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/meta.json deleted file mode 100644 index 542b4ce7e5..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "50aef-1", "directions": 1}, {"name": "50aef-0", "directions": 1}, {"name": "50aef", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv-1.png deleted file mode 100644 index 64d5b7f216..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv.png deleted file mode 100644 index 64d5b7f216..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/meta.json deleted file mode 100644 index b198e25348..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "50aehv-1", "directions": 1}, {"name": "50aehv-0", "directions": 1}, {"name": "50aehv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael-1.png deleted file mode 100644 index f6d42a0402..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael.png deleted file mode 100644 index f6d42a0402..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/meta.json deleted file mode 100644 index 6ef96e3c7b..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "50ael-1", "directions": 1}, {"name": "50ael-0", "directions": 1}, {"name": "50ael", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep-1.png deleted file mode 100644 index ff09f2eb79..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep.png deleted file mode 100644 index ff09f2eb79..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/meta.json deleted file mode 100644 index 6ac788d048..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "50aep-1", "directions": 1}, {"name": "50aep-0", "directions": 1}, {"name": "50aep", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer-1.png deleted file mode 100644 index 681af36b78..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer.png deleted file mode 100644 index 681af36b78..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/meta.json deleted file mode 100644 index 0d3cbe5f41..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "50aer-1", "directions": 1}, {"name": "50aer-0", "directions": 1}, {"name": "50aer", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-0.png deleted file mode 100644 index bac7030752..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-1.png deleted file mode 100644 index 3c82c80221..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-2.png deleted file mode 100644 index c467541c1f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-3.png deleted file mode 100644 index 54fc9e402d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-4.png deleted file mode 100644 index d786592c07..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10.png deleted file mode 100644 index d786592c07..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/meta.json deleted file mode 100644 index ebc270f596..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "10-4", "directions": 1}, {"name": "10-3", "directions": 1}, {"name": "10-2", "directions": 1}, {"name": "10-1", "directions": 1}, {"name": "10-0", "directions": 1}, {"name": "10", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-0.png deleted file mode 100644 index ed938cc6e0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-1.png deleted file mode 100644 index 86dac666e8..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-2.png deleted file mode 100644 index b797ead597..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-3.png deleted file mode 100644 index f37ac6fedf..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-4.png deleted file mode 100644 index aacbb79436..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f.png deleted file mode 100644 index aacbb79436..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/meta.json deleted file mode 100644 index 3bc693ff03..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "10f-4", "directions": 1}, {"name": "10f-3", "directions": 1}, {"name": "10f-2", "directions": 1}, {"name": "10f-1", "directions": 1}, {"name": "10f-0", "directions": 1}, {"name": "10f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-0.png deleted file mode 100644 index c5a1b711c8..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-1.png deleted file mode 100644 index 27d89d5ada..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-2.png deleted file mode 100644 index c5c9e01140..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-3.png deleted file mode 100644 index 53c2c88359..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-4.png deleted file mode 100644 index dccaa76a56..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv.png deleted file mode 100644 index dccaa76a56..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/meta.json deleted file mode 100644 index a0455a12de..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "10hv-4", "directions": 1}, {"name": "10hv-3", "directions": 1}, {"name": "10hv-2", "directions": 1}, {"name": "10hv-1", "directions": 1}, {"name": "10hv-0", "directions": 1}, {"name": "10hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-0.png deleted file mode 100644 index ccc517a1c6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-1.png deleted file mode 100644 index 7cda0f0608..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-2.png deleted file mode 100644 index a731f74f22..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-3.png deleted file mode 100644 index cd4cceda48..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-4.png deleted file mode 100644 index d4e9653435..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l.png deleted file mode 100644 index d4e9653435..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/meta.json deleted file mode 100644 index 0b621edc33..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "10l-4", "directions": 1}, {"name": "10l-3", "directions": 1}, {"name": "10l-2", "directions": 1}, {"name": "10l-1", "directions": 1}, {"name": "10l-0", "directions": 1}, {"name": "10l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-0.png deleted file mode 100644 index ca9ea1c3c2..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-1.png deleted file mode 100644 index 527d254ba7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-2.png deleted file mode 100644 index a8832e827b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-3.png deleted file mode 100644 index 2c60927370..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-4.png deleted file mode 100644 index 26d483adb5..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p.png deleted file mode 100644 index 26d483adb5..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/meta.json deleted file mode 100644 index 4a11878ae3..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "10p-4", "directions": 1}, {"name": "10p-3", "directions": 1}, {"name": "10p-2", "directions": 1}, {"name": "10p-1", "directions": 1}, {"name": "10p-0", "directions": 1}, {"name": "10p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-0.png deleted file mode 100644 index f55acb8266..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-1.png deleted file mode 100644 index 4c63799f13..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-2.png deleted file mode 100644 index 792a6088df..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-3.png deleted file mode 100644 index 1c5828be77..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-4.png deleted file mode 100644 index eafc2cbc6d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r.png deleted file mode 100644 index eafc2cbc6d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/meta.json deleted file mode 100644 index 38b27c9b10..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "10r-4", "directions": 1}, {"name": "10r-3", "directions": 1}, {"name": "10r-2", "directions": 1}, {"name": "10r-1", "directions": 1}, {"name": "10r-0", "directions": 1}, {"name": "10r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf-0.png deleted file mode 100644 index 3c8d74b58a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf-1.png deleted file mode 100644 index bca95849a2..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf.png deleted file mode 100644 index bca95849a2..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/meta.json deleted file mode 100644 index b15d389285..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "12mmf-1", "directions": 1}, {"name": "12mmf-0", "directions": 1}, {"name": "12mmf", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv-0.png deleted file mode 100644 index 7faf35de52..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv-1.png deleted file mode 100644 index b5099c9dc0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv.png deleted file mode 100644 index b5099c9dc0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/meta.json deleted file mode 100644 index d28b7f77df..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "12mmhv-1", "directions": 1}, {"name": "12mmhv-0", "directions": 1}, {"name": "12mmhv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml-0.png deleted file mode 100644 index d8f8d0d74f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml-1.png deleted file mode 100644 index 4c59a44558..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml.png deleted file mode 100644 index 4c59a44558..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/meta.json deleted file mode 100644 index 8af111d58d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "12mml-1", "directions": 1}, {"name": "12mml-0", "directions": 1}, {"name": "12mml", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp-0.png deleted file mode 100644 index d76ee4aea1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp-1.png deleted file mode 100644 index d6b31f96d4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp.png deleted file mode 100644 index d6b31f96d4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/meta.json deleted file mode 100644 index ad386b3192..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "12mmp-1", "directions": 1}, {"name": "12mmp-0", "directions": 1}, {"name": "12mmp", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr-0.png deleted file mode 100644 index 8e9f574e55..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr-1.png deleted file mode 100644 index 0df254105a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr.png deleted file mode 100644 index 0df254105a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/meta.json deleted file mode 100644 index 1239574476..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "12mmr-1", "directions": 1}, {"name": "12mmr-0", "directions": 1}, {"name": "12mmr", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75-0.png deleted file mode 100644 index ee8536455c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75-1.png deleted file mode 100644 index b5da2f5794..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75.png deleted file mode 100644 index b5da2f5794..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/meta.json deleted file mode 100644 index fd5ea342d1..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "75-0", "directions": 1}, {"name": "75-1", "directions": 1}, {"name": "75", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-1.png deleted file mode 100644 index 03d174c7ae..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-2.png deleted file mode 100644 index 65eb75c02c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-3.png deleted file mode 100644 index 04da587747..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24.png deleted file mode 100644 index 9a0cfee6b6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/meta.json deleted file mode 100644 index b013fad32a..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "10x24-4", "directions": 1}, {"name": "10x24-3", "directions": 1}, {"name": "10x24-2", "directions": 1}, {"name": "10x24-1", "directions": 1}, {"name": "10x24-0", "directions": 1}, {"name": "10x24", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56-0.png deleted file mode 100644 index ee8536455c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56-1.png deleted file mode 100644 index b5da2f5794..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56.png deleted file mode 100644 index b5da2f5794..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/meta.json deleted file mode 100644 index 947ba89f99..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b98bdfdeb2b7b7d657e620e498427ae6220d55df/icons/obj/ammo_mags.dmi", "states": [{"name": "5.56-0", "directions": 1}, {"name": "5.56-1", "directions": 1}, {"name": "5.56", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s-0.png deleted file mode 100644 index fd3be497f9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s-1.png deleted file mode 100644 index 9040b7821d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s.png deleted file mode 100644 index 9040b7821d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/meta.json deleted file mode 100644 index b9df60db7d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/b98bdfdeb2b7b7d657e620e498427ae6220d55df/icons/obj/ammo_mags.dmi", "states": [{"name": "5.56s-0", "directions": 1}, {"name": "5.56s-1", "directions": 1}, {"name": "5.56s", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-0.png deleted file mode 100644 index b9c7d16d2a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag.png deleted file mode 100644 index cd7f89823d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/meta.json deleted file mode 100644 index 05685aa91e..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "WinMag-1", "directions": 1}, {"name": "WinMag-0", "directions": 1}, {"name": "WinMag", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h.png deleted file mode 100644 index 72d850aadf..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/meta.json deleted file mode 100644 index 6930d75303..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "WinMag_h-1", "directions": 1}, {"name": "WinMag_h-0", "directions": 1}, {"name": "WinMag_h", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r-0.png deleted file mode 100644 index f13485a3d0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r.png deleted file mode 100644 index 508a73c36e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/meta.json deleted file mode 100644 index 34386f7f5c..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "WinMag_r-1", "directions": 1}, {"name": "WinMag_r-0", "directions": 1}, {"name": "WinMag_r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/meta.json deleted file mode 100644 index 620e204226..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_sol-2", "directions": 1}, {"name": "mg_ih_sol-0", "directions": 1}, {"name": "mg_ih_sol-3", "directions": 1}, {"name": "mg_ih_sol-1", "directions": 1}, {"name": "mg_ih_sol", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-1.png deleted file mode 100644 index b9c7d16d2a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-2.png deleted file mode 100644 index 8ed18ba28f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-3.png deleted file mode 100644 index cd7f89823d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol.png deleted file mode 100644 index cd7f89823d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/meta.json deleted file mode 100644 index 77a84ad3de..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_sol_f-2", "directions": 1}, {"name": "mg_ih_sol_f-0", "directions": 1}, {"name": "mg_ih_sol_f-3", "directions": 1}, {"name": "mg_ih_sol_f-1", "directions": 1}, {"name": "mg_ih_sol_f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-0.png deleted file mode 100644 index a370e7f0bc..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-2.png deleted file mode 100644 index 3a533b65fc..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f.png deleted file mode 100644 index 2a1ea31d84..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/meta.json deleted file mode 100644 index 8af5a2fba2..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_sol_hv-2", "directions": 1}, {"name": "mg_ih_sol_hv-0", "directions": 1}, {"name": "mg_ih_sol_hv-3", "directions": 1}, {"name": "mg_ih_sol_hv-1", "directions": 1}, {"name": "mg_ih_sol_hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-0.png deleted file mode 100644 index 823292807a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-2.png deleted file mode 100644 index b7d1f94a17..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv.png deleted file mode 100644 index 2333c60012..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/meta.json deleted file mode 100644 index 886e84583f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_sol_l-2", "directions": 1}, {"name": "mg_ih_sol_l-0", "directions": 1}, {"name": "mg_ih_sol_l-3", "directions": 1}, {"name": "mg_ih_sol_l-1", "directions": 1}, {"name": "mg_ih_sol_l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-0.png deleted file mode 100644 index 81b1637f12..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-1.png deleted file mode 100644 index 829fcd6d59..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-2.png deleted file mode 100644 index 7158befa61..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-3.png deleted file mode 100644 index 72d850aadf..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l.png deleted file mode 100644 index 72d850aadf..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/meta.json deleted file mode 100644 index e9ea39aa3d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_sol_p-2", "directions": 1}, {"name": "mg_ih_sol_p-0", "directions": 1}, {"name": "mg_ih_sol_p-3", "directions": 1}, {"name": "mg_ih_sol_p-1", "directions": 1}, {"name": "mg_ih_sol_p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-0.png deleted file mode 100644 index c583bfdb2c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-2.png deleted file mode 100644 index e2605795f2..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p.png deleted file mode 100644 index b2cd3d45ec..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/meta.json deleted file mode 100644 index d282a446a9..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "mg_ih_sol_r-2", "directions": 1}, {"name": "mg_ih_sol_r-0", "directions": 1}, {"name": "mg_ih_sol_r-3", "directions": 1}, {"name": "mg_ih_sol_r-1", "directions": 1}, {"name": "mg_ih_sol_r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-0.png deleted file mode 100644 index c7d76652c4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-1.png deleted file mode 100644 index c7d76652c4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-2.png deleted file mode 100644 index 1d302b1009..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-3.png deleted file mode 100644 index 508a73c36e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r.png deleted file mode 100644 index 508a73c36e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag.png deleted file mode 100644 index 690ff77b12..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/meta.json deleted file mode 100644 index 3987cff323..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AKMag-1", "directions": 1}, {"name": "AKMag-0", "directions": 1}, {"name": "AKMag", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f.png deleted file mode 100644 index 1b77b851d6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/meta.json deleted file mode 100644 index 93e023a1c2..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AKMag_f-1", "directions": 1}, {"name": "AKMag_f-0", "directions": 1}, {"name": "AKMag_f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv.png deleted file mode 100644 index 53349f4692..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/meta.json deleted file mode 100644 index e8510ffad4..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AKMag_hv-1", "directions": 1}, {"name": "AKMag_hv-0", "directions": 1}, {"name": "AKMag_hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l.png deleted file mode 100644 index b77ffd8187..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/meta.json deleted file mode 100644 index 6586e762b7..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AKMag_l-1", "directions": 1}, {"name": "AKMag_l-0", "directions": 1}, {"name": "AKMag_l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p.png deleted file mode 100644 index 806b881a60..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/meta.json deleted file mode 100644 index 58b4394a95..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AKMag_p-1", "directions": 1}, {"name": "AKMag_p-0", "directions": 1}, {"name": "AKMag_p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r.png deleted file mode 100644 index cc6359b439..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/meta.json deleted file mode 100644 index 8ab5540e15..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AKMag_r-1", "directions": 1}, {"name": "AKMag_r-0", "directions": 1}, {"name": "AKMag_r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short.png deleted file mode 100644 index 1800b1d61f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/meta.json deleted file mode 100644 index 05d3b9fecb..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AK_short-1", "directions": 1}, {"name": "AK_short-0", "directions": 1}, {"name": "AK_short", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f.png deleted file mode 100644 index 7f4c62c9fc..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/meta.json deleted file mode 100644 index b521d2f61e..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AK_short_f-1", "directions": 1}, {"name": "AK_short_f-0", "directions": 1}, {"name": "AK_short_f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv.png deleted file mode 100644 index ecf4b59886..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/meta.json deleted file mode 100644 index 9a47c4391b..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AK_short_hv-1", "directions": 1}, {"name": "AK_short_hv-0", "directions": 1}, {"name": "AK_short_hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l.png deleted file mode 100644 index ab03b01371..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/meta.json deleted file mode 100644 index 8727329dec..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AK_short_l-1", "directions": 1}, {"name": "AK_short_l-0", "directions": 1}, {"name": "AK_short_l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p.png deleted file mode 100644 index 95b350727b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/meta.json deleted file mode 100644 index fcf8577baa..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AK_short_p-1", "directions": 1}, {"name": "AK_short_p-0", "directions": 1}, {"name": "AK_short_p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r.png deleted file mode 100644 index 80ff862d88..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/meta.json deleted file mode 100644 index 4fbf69be04..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "AK_short_r-1", "directions": 1}, {"name": "AK_short_r-0", "directions": 1}, {"name": "AK_short_r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-1.png deleted file mode 100644 index 54c1ed75f0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-2.png deleted file mode 100644 index cf472a2aa5..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-3.png deleted file mode 100644 index 0496083445..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-4.png deleted file mode 100644 index 2b8b90f916..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762.png deleted file mode 100644 index e1f5c4a1af..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/meta.json deleted file mode 100644 index 7942e47c7b..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "a762-5", "directions": 1}, {"name": "a762-4", "directions": 1}, {"name": "a762-3", "directions": 1}, {"name": "a762-2", "directions": 1}, {"name": "a762-1", "directions": 1}, {"name": "a762-0", "directions": 1}, {"name": "a762", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-0.png deleted file mode 100644 index cb448146c6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-1.png deleted file mode 100644 index 54c1ed75f0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-2.png deleted file mode 100644 index cf472a2aa5..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-3.png deleted file mode 100644 index 0496083445..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-4.png deleted file mode 100644 index 2b8b90f916..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-5.png deleted file mode 100644 index e1f5c4a1af..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine.png deleted file mode 100644 index cb448146c6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/meta.json deleted file mode 100644 index faed3403e3..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/meta.json +++ /dev/null @@ -1,74 +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/ammo_mags.dmi", - "states": [ - { - "name": "a762_magazine-5", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "a762_magazine-4", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "a762_magazine-3", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "a762_magazine-2", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "a762_magazine-1", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "a762_magazine-0", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "a762_magazine", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762.png deleted file mode 100644 index e36e9a21e9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/meta.json deleted file mode 100644 index 4af0cd0f6a..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "c762-1", "directions": 1}, {"name": "c762-0", "directions": 1}, {"name": "c762", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f.png deleted file mode 100644 index c34a056ece..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/meta.json deleted file mode 100644 index 2bfbd2b1f2..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "c762f-1", "directions": 1}, {"name": "c762f-0", "directions": 1}, {"name": "c762f", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv.png deleted file mode 100644 index a44b6ed3d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/meta.json deleted file mode 100644 index ed80516a6b..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "c762hv-1", "directions": 1}, {"name": "c762hv-0", "directions": 1}, {"name": "c762hv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l.png deleted file mode 100644 index 1641c3591a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/meta.json deleted file mode 100644 index b4b9e80d6f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "c762l-1", "directions": 1}, {"name": "c762l-0", "directions": 1}, {"name": "c762l", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p.png deleted file mode 100644 index 846e052f4a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/meta.json deleted file mode 100644 index 148d0b98e5..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "c762p-1", "directions": 1}, {"name": "c762p-0", "directions": 1}, {"name": "c762p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r.png deleted file mode 100644 index e50893989e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/meta.json deleted file mode 100644 index 553541e77c..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "c762r-1", "directions": 1}, {"name": "c762r-0", "directions": 1}, {"name": "c762r", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim.png deleted file mode 100644 index e3d3c0a186..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/meta.json deleted file mode 100644 index 19d3507f6f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/meta.json +++ /dev/null @@ -1,65 +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/ammo.dmi", - "states": [ - { - "name": "pk_box-4", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "pk_box-3", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "pk_box-2", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "pk_box-1", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "pk_box-0", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "pk_box", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-1.png deleted file mode 100644 index 2e8644c139..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-2.png deleted file mode 100644 index 2c38121f4b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-3.png deleted file mode 100644 index 6c6d5e9628..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-4.png deleted file mode 100644 index 0dc4cc75ba..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-0.png deleted file mode 100644 index f73b18d765..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-1.png deleted file mode 100644 index 9bb095072c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-2.png deleted file mode 100644 index 1b89b4a9ab..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-3.png deleted file mode 100644 index 9bb095072c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-4.png deleted file mode 100644 index 2859e93a43..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt.png deleted file mode 100644 index e3722c32d1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/meta.json deleted file mode 100644 index 8bf6cef27d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "9mmt-3", "directions": 1}, {"name": "9mmt-2", "directions": 1}, {"name": "9mmt-1", "directions": 1}, {"name": "9mmt-5", "directions": 1}, {"name": "9mmt-4", "directions": 1}, {"name": "9mmt-0", "directions": 1}, {"name": "9mmt", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p.png deleted file mode 100644 index 285483cff7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/meta.json deleted file mode 100644 index 5023efc91d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "9x19p-1", "directions": 1}, {"name": "9x19p-0", "directions": 1}, {"name": "9x19p", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf.png deleted file mode 100644 index b4c2878453..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/meta.json deleted file mode 100644 index 2d0c539a7f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "9x19pf-1", "directions": 1}, {"name": "9x19pf-0", "directions": 1}, {"name": "9x19pf", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv.png deleted file mode 100644 index ef5353437b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/meta.json deleted file mode 100644 index 50e336f3c6..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "9x19phv-1", "directions": 1}, {"name": "9x19phv-0", "directions": 1}, {"name": "9x19phv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/meta.json deleted file mode 100644 index 3906f541e4..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "9x19pl-0", "directions": 1}, {"name": "9x19pl", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp.png deleted file mode 100644 index 99aa029e73..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/meta.json deleted file mode 100644 index 0624700da3..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "9x19pp-1", "directions": 1}, {"name": "9x19pp-0", "directions": 1}, {"name": "9x19pp", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr.png deleted file mode 100644 index 10726c2bda..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/meta.json deleted file mode 100644 index 658866079d..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "9x19pr-1", "directions": 1}, {"name": "9x19pr-0", "directions": 1}, {"name": "9x19pr", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/meta.json deleted file mode 100644 index 675ce9b41f..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg9mm-1", "directions": 1}, {"name": "smg9mm-0", "directions": 1}, {"name": "smg9mm", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm.png deleted file mode 100644 index c720b63c4a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/meta.json deleted file mode 100644 index 9f5430dbfd..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg9mmf-1", "directions": 1}, {"name": "smg9mmf-0", "directions": 1}, {"name": "smg9mmf", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf.png deleted file mode 100644 index b21b7ea0a8..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/meta.json deleted file mode 100644 index 659b4fe077..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg9mmhv-1", "directions": 1}, {"name": "smg9mmhv-0", "directions": 1}, {"name": "smg9mmhv", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv.png deleted file mode 100644 index e431932424..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/meta.json deleted file mode 100644 index e394da9a46..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg9mml-1", "directions": 1}, {"name": "smg9mml-0", "directions": 1}, {"name": "smg9mml", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml.png deleted file mode 100644 index 5c69cb88b9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/meta.json deleted file mode 100644 index be793472ad..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg9mmp-1", "directions": 1}, {"name": "smg9mmp-0", "directions": 1}, {"name": "smg9mmp", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp.png deleted file mode 100644 index 184135d07e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/meta.json deleted file mode 100644 index cd5b8ba5f6..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "smg9mmr-1", "directions": 1}, {"name": "smg9mmr-0", "directions": 1}, {"name": "smg9mmr", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr.png deleted file mode 100644 index 5f6569bad7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-4.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-1.png new file mode 100644 index 0000000000..b5b70cc859 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-2.png new file mode 100644 index 0000000000..fa67e8801c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-3.png new file mode 100644 index 0000000000..b436f1dbc8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-4.png new file mode 100644 index 0000000000..8505a40d6d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-5.png new file mode 100644 index 0000000000..8da9ab83e5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-6.png new file mode 100644 index 0000000000..703bfbf86d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-7.png new file mode 100644 index 0000000000..4c0454314d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-7.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/meta.json new file mode 100644 index 0000000000..49902da186 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + }, + { + "name": "mag-7", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/base.png new file mode 100644 index 0000000000..46513d82ea Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/icon.png new file mode 100644 index 0000000000..0d78ee4ccc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-1.png new file mode 100644 index 0000000000..4f930fb7ca Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-2.png new file mode 100644 index 0000000000..36da9b29a5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-3.png new file mode 100644 index 0000000000..69f0ef4b5d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-4.png new file mode 100644 index 0000000000..16c225e946 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-5.png new file mode 100644 index 0000000000..cf1c48a34e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/meta.json new file mode 100644 index 0000000000..4e66ae10bc --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/base.png new file mode 100644 index 0000000000..f12128a305 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/icon.png new file mode 100644 index 0000000000..874b8e41d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..4f930fb7ca Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-2.png new file mode 100644 index 0000000000..36da9b29a5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-3.png new file mode 100644 index 0000000000..69f0ef4b5d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-4.png new file mode 100644 index 0000000000..16c225e946 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-5.png new file mode 100644 index 0000000000..cf1c48a34e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/meta.json new file mode 100644 index 0000000000..4e66ae10bc --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/base.png new file mode 100644 index 0000000000..12db113a6e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/icon.png new file mode 100644 index 0000000000..708b39395e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..4f930fb7ca Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-2.png new file mode 100644 index 0000000000..36da9b29a5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-3.png new file mode 100644 index 0000000000..69f0ef4b5d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-4.png new file mode 100644 index 0000000000..16c225e946 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-5.png new file mode 100644 index 0000000000..cf1c48a34e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..4e66ae10bc --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/base.png new file mode 100644 index 0000000000..aa73e7a4da Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/icon.png new file mode 100644 index 0000000000..169769209b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..4f930fb7ca Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-2.png new file mode 100644 index 0000000000..36da9b29a5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-3.png new file mode 100644 index 0000000000..69f0ef4b5d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-4.png new file mode 100644 index 0000000000..16c225e946 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-5.png new file mode 100644 index 0000000000..cf1c48a34e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..4e66ae10bc --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/base.png new file mode 100644 index 0000000000..9a5730ff0a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/icon.png new file mode 100644 index 0000000000..7d0152f1c4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..4f930fb7ca Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-2.png new file mode 100644 index 0000000000..36da9b29a5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-3.png new file mode 100644 index 0000000000..69f0ef4b5d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-4.png new file mode 100644 index 0000000000..16c225e946 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-5.png new file mode 100644 index 0000000000..cf1c48a34e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..4e66ae10bc --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/mag-1.png new file mode 100644 index 0000000000..54bf062641 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/meta.json similarity index 81% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/meta.json rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/meta.json index 04a019c1ae..e4f2abdee0 100644 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/meta.json @@ -8,15 +8,15 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [ { - "name": "maxim", + "name": "icon", "directions": 1 }, { - "name": "maxim-0", + "name": "base", "directions": 1 }, { - "name": "maxim-1", + "name": "mag-1", "directions": 1 } ] diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..54bf062641 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-3.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/mag-1.png new file mode 100644 index 0000000000..54bf062641 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-3.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..54bf062641 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-3.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..54bf062641 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/base.png new file mode 100644 index 0000000000..f7aadbfcb8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..54bf062641 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/mag-1.png new file mode 100644 index 0000000000..f67c10605d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/mag-1.png new file mode 100644 index 0000000000..f67c10605d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/mag-1.png new file mode 100644 index 0000000000..f67c10605d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/mag-1.png new file mode 100644 index 0000000000..f67c10605d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/mag-1.png new file mode 100644 index 0000000000..f67c10605d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..f67c10605d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/base.png new file mode 100644 index 0000000000..9a885e2b61 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/icon.png new file mode 100644 index 0000000000..b6532ba9f9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..67bb78ebcf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..6aa8a7c6b4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..cd64503394 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..0678495645 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-5.png new file mode 100644 index 0000000000..f07a2051f6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json new file mode 100644 index 0000000000..867dbe75ec --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "mag-unshaded-4", + "directions": 1 + }, + { + "name": "mag-unshaded-5", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-5.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-1.png new file mode 100644 index 0000000000..4042707f21 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-2.png new file mode 100644 index 0000000000..efb45f37ab Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-3.png new file mode 100644 index 0000000000..988fecc36a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-4.png new file mode 100644 index 0000000000..44143008c6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-5.png new file mode 100644 index 0000000000..3ba6072f29 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-6.png new file mode 100644 index 0000000000..f24752ef79 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-7.png new file mode 100644 index 0000000000..f92d2b802e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/mag-7.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/meta.json new file mode 100644 index 0000000000..49902da186 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + }, + { + "name": "mag-7", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/mag-1.png new file mode 100644 index 0000000000..639ec8244c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..639ec8244c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/mag-1.png new file mode 100644 index 0000000000..639ec8244c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..639ec8244c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..639ec8244c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..639ec8244c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/mag-1.png new file mode 100644 index 0000000000..4da6b51c48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/maxim.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-1.png new file mode 100644 index 0000000000..260247c5a2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-2.png new file mode 100644 index 0000000000..717c11340b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-3.png new file mode 100644 index 0000000000..130610ab26 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-4.png new file mode 100644 index 0000000000..2946665292 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-5.png new file mode 100644 index 0000000000..db40177f8d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-6.png new file mode 100644 index 0000000000..18f998746a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-7.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-7.png new file mode 100644 index 0000000000..ebaaa6e4d5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/mag-7.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/meta.json new file mode 100644 index 0000000000..a3103d255e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "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/ammo.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + }, + { + "name": "mag-7", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-1.png new file mode 100644 index 0000000000..4bfdd096ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-2.png new file mode 100644 index 0000000000..6a97e07ec7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-3.png new file mode 100644 index 0000000000..94d1a275e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-4.png new file mode 100644 index 0000000000..68d8fc44ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..4bfdd096ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-2.png new file mode 100644 index 0000000000..6a97e07ec7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-3.png new file mode 100644 index 0000000000..94d1a275e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-4.png new file mode 100644 index 0000000000..68d8fc44ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-1.png new file mode 100644 index 0000000000..4bfdd096ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-2.png new file mode 100644 index 0000000000..6a97e07ec7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-3.png new file mode 100644 index 0000000000..94d1a275e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-4.png new file mode 100644 index 0000000000..68d8fc44ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..4bfdd096ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-2.png new file mode 100644 index 0000000000..6a97e07ec7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-3.png new file mode 100644 index 0000000000..94d1a275e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-4.png new file mode 100644 index 0000000000..68d8fc44ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..4bfdd096ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-2.png new file mode 100644 index 0000000000..6a97e07ec7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-3.png new file mode 100644 index 0000000000..94d1a275e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-4.png new file mode 100644 index 0000000000..68d8fc44ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..4bfdd096ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-2.png new file mode 100644 index 0000000000..6a97e07ec7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-3.png new file mode 100644 index 0000000000..94d1a275e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-4.png new file mode 100644 index 0000000000..68d8fc44ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png new file mode 100644 index 0000000000..2cda904388 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/icon.png new file mode 100644 index 0000000000..fc43082e83 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png new file mode 100644 index 0000000000..54966daa23 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/base.png new file mode 100644 index 0000000000..5bf9ecc11e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/icon.png new file mode 100644 index 0000000000..c89015bedb Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..54966daa23 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/base.png new file mode 100644 index 0000000000..c6b2761cff Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/icon.png new file mode 100644 index 0000000000..58b995360c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..54966daa23 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/base.png new file mode 100644 index 0000000000..542529b728 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/icon.png new file mode 100644 index 0000000000..39086e8632 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..54966daa23 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/base.png new file mode 100644 index 0000000000..ee9fff67b9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/icon.png new file mode 100644 index 0000000000..50c09cc390 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..54966daa23 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-2.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-1.png new file mode 100644 index 0000000000..8832cd933b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-2.png new file mode 100644 index 0000000000..c5b8b2b2b4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-3.png new file mode 100644 index 0000000000..a563ffebf8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-4.png new file mode 100644 index 0000000000..8a3db8895b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-5.png new file mode 100644 index 0000000000..2f60a0408e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-6.png new file mode 100644 index 0000000000..b0ec894ff3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/meta.json new file mode 100644 index 0000000000..9090eaf12f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-2.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..8832cd933b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-2.png new file mode 100644 index 0000000000..c5b8b2b2b4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-3.png new file mode 100644 index 0000000000..a563ffebf8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-4.png new file mode 100644 index 0000000000..8a3db8895b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-5.png new file mode 100644 index 0000000000..2f60a0408e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-6.png new file mode 100644 index 0000000000..b0ec894ff3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/meta.json new file mode 100644 index 0000000000..9090eaf12f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-2.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..8832cd933b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-2.png new file mode 100644 index 0000000000..c5b8b2b2b4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-3.png new file mode 100644 index 0000000000..a563ffebf8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-4.png new file mode 100644 index 0000000000..8a3db8895b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-5.png new file mode 100644 index 0000000000..2f60a0408e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-6.png new file mode 100644 index 0000000000..b0ec894ff3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..9090eaf12f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-2.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..8832cd933b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-2.png new file mode 100644 index 0000000000..c5b8b2b2b4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-3.png new file mode 100644 index 0000000000..a563ffebf8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-4.png new file mode 100644 index 0000000000..8a3db8895b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-5.png new file mode 100644 index 0000000000..2f60a0408e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-6.png new file mode 100644 index 0000000000..b0ec894ff3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..9090eaf12f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-2.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..8832cd933b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-2.png new file mode 100644 index 0000000000..c5b8b2b2b4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-3.png new file mode 100644 index 0000000000..a563ffebf8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-4.png new file mode 100644 index 0000000000..8a3db8895b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-5.png new file mode 100644 index 0000000000..2f60a0408e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-6.png new file mode 100644 index 0000000000..b0ec894ff3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..9090eaf12f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png new file mode 100644 index 0000000000..ef549ebdfc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png new file mode 100644 index 0000000000..0468459439 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png new file mode 100644 index 0000000000..06f19ec207 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png new file mode 100644 index 0000000000..5b9929303c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..ef549ebdfc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-2.png new file mode 100644 index 0000000000..0468459439 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-3.png new file mode 100644 index 0000000000..06f19ec207 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-4.png new file mode 100644 index 0000000000..5b9929303c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-1.png new file mode 100644 index 0000000000..ef549ebdfc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-2.png new file mode 100644 index 0000000000..0468459439 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-3.png new file mode 100644 index 0000000000..06f19ec207 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-4.png new file mode 100644 index 0000000000..5b9929303c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-8.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-1.png new file mode 100644 index 0000000000..68c0528a99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-2.png new file mode 100644 index 0000000000..abe2107373 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-3.png new file mode 100644 index 0000000000..bd66ea4630 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-4.png new file mode 100644 index 0000000000..1bc185a7a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-5.png new file mode 100644 index 0000000000..51016d86f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-6.png new file mode 100644 index 0000000000..723f541e48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/meta.json new file mode 100644 index 0000000000..13039c2391 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/50ae.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/50ae.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-8.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-1.png new file mode 100644 index 0000000000..68c0528a99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-2.png new file mode 100644 index 0000000000..abe2107373 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-3.png new file mode 100644 index 0000000000..bd66ea4630 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-4.png new file mode 100644 index 0000000000..1bc185a7a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-5.png new file mode 100644 index 0000000000..51016d86f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-6.png new file mode 100644 index 0000000000..723f541e48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/meta.json new file mode 100644 index 0000000000..13039c2391 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-2.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-1.png new file mode 100644 index 0000000000..68c0528a99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-2.png new file mode 100644 index 0000000000..abe2107373 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-3.png new file mode 100644 index 0000000000..bd66ea4630 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-4.png new file mode 100644 index 0000000000..1bc185a7a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-5.png new file mode 100644 index 0000000000..51016d86f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-6.png new file mode 100644 index 0000000000..723f541e48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/meta.json new file mode 100644 index 0000000000..13039c2391 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-8.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-1.png new file mode 100644 index 0000000000..68c0528a99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-2.png new file mode 100644 index 0000000000..abe2107373 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-3.png new file mode 100644 index 0000000000..bd66ea4630 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-4.png new file mode 100644 index 0000000000..1bc185a7a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-5.png new file mode 100644 index 0000000000..51016d86f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-6.png new file mode 100644 index 0000000000..723f541e48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/meta.json new file mode 100644 index 0000000000..13039c2391 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-8.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-1.png new file mode 100644 index 0000000000..68c0528a99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-2.png new file mode 100644 index 0000000000..abe2107373 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-3.png new file mode 100644 index 0000000000..bd66ea4630 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-4.png new file mode 100644 index 0000000000..1bc185a7a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-5.png new file mode 100644 index 0000000000..51016d86f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-6.png new file mode 100644 index 0000000000..723f541e48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/meta.json new file mode 100644 index 0000000000..13039c2391 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-8.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..68c0528a99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-2.png new file mode 100644 index 0000000000..abe2107373 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-3.png new file mode 100644 index 0000000000..bd66ea4630 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-4.png new file mode 100644 index 0000000000..1bc185a7a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-5.png new file mode 100644 index 0000000000..51016d86f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-6.png new file mode 100644 index 0000000000..723f541e48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/meta.json new file mode 100644 index 0000000000..13039c2391 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..ef549ebdfc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-2.png new file mode 100644 index 0000000000..0468459439 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-3.png new file mode 100644 index 0000000000..06f19ec207 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-4.png new file mode 100644 index 0000000000..5b9929303c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..ef549ebdfc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-2.png new file mode 100644 index 0000000000..0468459439 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-3.png new file mode 100644 index 0000000000..06f19ec207 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-4.png new file mode 100644 index 0000000000..5b9929303c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..ef549ebdfc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-2.png new file mode 100644 index 0000000000..0468459439 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-3.png new file mode 100644 index 0000000000..06f19ec207 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-4.png new file mode 100644 index 0000000000..5b9929303c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..4f37e727e1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png new file mode 100644 index 0000000000..c7810c79a6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..c7810c79a6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/mag-1.png new file mode 100644 index 0000000000..c7810c79a6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..c7810c79a6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..c7810c79a6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..c7810c79a6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png new file mode 100644 index 0000000000..f8d892f85b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-5.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..f41552e052 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..5a2edcc997 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..43639e90f7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..a1e45f380f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-5.png new file mode 100644 index 0000000000..dfb0aaaf29 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/mag-unshaded-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json new file mode 100644 index 0000000000..ea37dbcb54 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "mag-unshaded-4", + "directions": 1 + }, + { + "name": "mag-unshaded-5", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/mag-1.png new file mode 100644 index 0000000000..bbd335adc7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/mag-1.png new file mode 100644 index 0000000000..bbd335adc7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/mag-1.png new file mode 100644 index 0000000000..bbd335adc7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/mag-1.png new file mode 100644 index 0000000000..bbd335adc7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/mag-1.png new file mode 100644 index 0000000000..bbd335adc7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-0.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-1.png rename to Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..bbd335adc7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/meta.json new file mode 100644 index 0000000000..e4f2abdee0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png new file mode 100644 index 0000000000..206b3f4209 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/icon.png new file mode 100644 index 0000000000..075e1f5aa2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png new file mode 100644 index 0000000000..9db3b89cfc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/base.png new file mode 100644 index 0000000000..630941378e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/icon.png new file mode 100644 index 0000000000..8d4c60d93c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/mag-1.png new file mode 100644 index 0000000000..bafb55b71c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/base.png new file mode 100644 index 0000000000..d4089970a7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/icon.png new file mode 100644 index 0000000000..f677531ced Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/mag-1.png new file mode 100644 index 0000000000..200edcb027 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/base.png new file mode 100644 index 0000000000..84e1f0f481 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/icon.png new file mode 100644 index 0000000000..634f16568d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/mag-1.png new file mode 100644 index 0000000000..3543e90cdd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/meta.json new file mode 100644 index 0000000000..a2043e384e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-0.png deleted file mode 100644 index dd82c98e30..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-1.png deleted file mode 100644 index 53978b7884..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-2.png deleted file mode 100644 index 46125c5eba..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-3.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-3.png deleted file mode 100644 index 6811f36bd6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-4.png deleted file mode 100644 index 45f9a322d9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-5.png deleted file mode 100644 index 1e21b9caa1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts.png deleted file mode 100644 index 1e21b9caa1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/meta.json deleted file mode 100644 index b64557eb3b..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [{"name": "darts-5", "directions": 1}, {"name": "darts-4", "directions": 1}, {"name": "darts-3", "directions": 1}, {"name": "darts-2", "directions": 1}, {"name": "darts-1", "directions": 1}, {"name": "darts-0", "directions": 1}, {"name": "darts", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/base.png new file mode 100644 index 0000000000..a1d04ba964 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/icon.png new file mode 100644 index 0000000000..10f1d89bf5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-1.png new file mode 100644 index 0000000000..937bb31e49 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-2.png new file mode 100644 index 0000000000..18eff624b7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-3.png new file mode 100644 index 0000000000..bbdd2f7b38 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-4.png new file mode 100644 index 0000000000..a492c486d6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-5.png new file mode 100644 index 0000000000..812f24ed45 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/meta.json new file mode 100644 index 0000000000..cf7cac37c5 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/icon.png new file mode 100644 index 0000000000..83623071fd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-1.png new file mode 100644 index 0000000000..851068d020 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-2.png new file mode 100644 index 0000000000..8b74c304de Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-3.png new file mode 100644 index 0000000000..03674aac81 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-4.png new file mode 100644 index 0000000000..870c1eddf9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-5.png new file mode 100644 index 0000000000..3f7bc4d1ea Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-6.png new file mode 100644 index 0000000000..5fce659e4a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/icon.png new file mode 100644 index 0000000000..4ba720b53d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-1.png new file mode 100644 index 0000000000..3b4d4dc717 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-2.png new file mode 100644 index 0000000000..e3ce4d4455 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-3.png new file mode 100644 index 0000000000..e2997462a0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-4.png new file mode 100644 index 0000000000..bce896fb47 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-5.png new file mode 100644 index 0000000000..c7b19398d1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-6.png new file mode 100644 index 0000000000..c5c22638d8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/icon.png new file mode 100644 index 0000000000..d86513750c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-1.png new file mode 100644 index 0000000000..ea749f13ad Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-2.png new file mode 100644 index 0000000000..882d2580d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-3.png new file mode 100644 index 0000000000..25f05232a5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-4.png new file mode 100644 index 0000000000..a94daa9433 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-5.png new file mode 100644 index 0000000000..2f1b23f6b2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-6.png new file mode 100644 index 0000000000..44f814982e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/icon.png new file mode 100644 index 0000000000..649c558b4a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-1.png new file mode 100644 index 0000000000..1357c294a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-2.png new file mode 100644 index 0000000000..773a65401a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-3.png new file mode 100644 index 0000000000..126ad2f4cc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-4.png new file mode 100644 index 0000000000..55ea711a48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-5.png new file mode 100644 index 0000000000..4f47f4010f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-6.png new file mode 100644 index 0000000000..450d88adf8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/icon.png new file mode 100644 index 0000000000..3c6dbb5d0b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..c8724e3cd0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-2.png new file mode 100644 index 0000000000..4a14a0d94f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-3.png new file mode 100644 index 0000000000..d545f9b5f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-4.png new file mode 100644 index 0000000000..bf0b85ec08 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-5.png new file mode 100644 index 0000000000..77e0f83e53 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-6.png new file mode 100644 index 0000000000..f3e474c87d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/icon.png new file mode 100644 index 0000000000..b1fbabf2c8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-1.png new file mode 100644 index 0000000000..c6e9efefaa Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-2.png new file mode 100644 index 0000000000..abf7ec8ff7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-3.png new file mode 100644 index 0000000000..cf69b60ef7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-4.png new file mode 100644 index 0000000000..e11b89d444 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-5.png new file mode 100644 index 0000000000..6509054779 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-6.png new file mode 100644 index 0000000000..c874cf1d02 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/icon.png new file mode 100644 index 0000000000..bdb7164bf9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-1.png new file mode 100644 index 0000000000..5aabe56998 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-2.png new file mode 100644 index 0000000000..87c172f616 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-3.png new file mode 100644 index 0000000000..45dc0a2735 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-4.png new file mode 100644 index 0000000000..4826271b83 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-5.png new file mode 100644 index 0000000000..d47f506850 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-6.png new file mode 100644 index 0000000000..10648a7e05 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/icon.png new file mode 100644 index 0000000000..4d25c62c86 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-1.png new file mode 100644 index 0000000000..e995979a61 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-2.png new file mode 100644 index 0000000000..09e5f15770 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-3.png new file mode 100644 index 0000000000..502e3d3683 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-4.png new file mode 100644 index 0000000000..ad7deaa0b5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-5.png new file mode 100644 index 0000000000..43baa78b94 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-6.png new file mode 100644 index 0000000000..50db6ec38b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/icon.png new file mode 100644 index 0000000000..a29da0a91f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-1.png new file mode 100644 index 0000000000..735dc30b25 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-2.png new file mode 100644 index 0000000000..42e830647e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-3.png new file mode 100644 index 0000000000..c3b62aa99b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-4.png new file mode 100644 index 0000000000..b049201465 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-5.png new file mode 100644 index 0000000000..7d544186ee Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-6.png new file mode 100644 index 0000000000..a0bec08901 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/base.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/base.png new file mode 100644 index 0000000000..4ba33eff44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/icon.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/icon.png new file mode 100644 index 0000000000..2f5d345277 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-1.png new file mode 100644 index 0000000000..31620f5e13 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-2.png new file mode 100644 index 0000000000..dca283caf9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-3.png new file mode 100644 index 0000000000..5c5a433317 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-4.png new file mode 100644 index 0000000000..9bb14be661 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-5.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-5.png new file mode 100644 index 0000000000..a52d8764c1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-6.png b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-6.png new file mode 100644 index 0000000000..714473f24c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/meta.json new file mode 100644 index 0000000000..100948b512 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 + }, + { + "name": "mag-6", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/meta.json deleted file mode 100644 index 1402537a73..0000000000 --- a/Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi", "states": [{"name": "s-casing", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/s-casing.png b/Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/s-casing.png deleted file mode 100644 index 1b01712316..0000000000 Binary files a/Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/s-casing.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/0-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/0-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/0-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/0-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/0-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/0-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/0-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/0-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/25-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/25-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/25-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/25-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/25-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/25-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/25-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/25-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/50-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/50-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/50-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/50-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/50-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/50-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/50-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/50-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/75-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/75-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/75-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/75-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/75-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/75-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/75-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/75-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/base.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/base.png new file mode 100644 index 0000000000..b98cfa078b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..0f4a4a7116 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..a29e958a5c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..66b9b42a2f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..73aa625ae3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/meta.json new file mode 100644 index 0000000000..f9798003c7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Battery/laser_cannon.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "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": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "mag-unshaded-4", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-inhand-left", + "directions": 4 + }, + { + "name": "0-inhand-right", + "directions": 4 + }, + { + "name": "25-inhand-left", + "directions": 4 + }, + { + "name": "25-inhand-right", + "directions": 4 + }, + { + "name": "50-inhand-left", + "directions": 4 + }, + { + "name": "50-inhand-right", + "directions": 4 + }, + { + "name": "75-inhand-left", + "directions": 4 + }, + { + "name": "75-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/base.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/base.png new file mode 100644 index 0000000000..5833e7876a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/icon.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/icon.png new file mode 100644 index 0000000000..f3cba12470 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/0-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left-0.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/0-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left-0.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/25-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left-1.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/25-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left-1.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/50-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left-2.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/50-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left-2.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/75-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left-3.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/75-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left-3.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/75-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/75-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/0-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right-0.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/0-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right-0.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/25-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right-1.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/25-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right-1.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/50-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right-2.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/50-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right-2.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right-3.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right-3.png diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..36ef0cea02 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..c456d45dcb Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..216d3e5cad Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..699a7fca0e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..9c22c69c87 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/meta.json b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/meta.json new file mode 100644 index 0000000000..8049744345 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Battery/laser_retro.rsi/meta.json @@ -0,0 +1,79 @@ +{ + "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": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-unshaded-0", + "directions": 1 + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "mag-unshaded-4", + "directions": 1 + }, + { + "name": "inhand-left-0", + "directions": 1 + }, + { + "name": "inhand-right-0", + "directions": 1 + }, + { + "name": "inhand-left-1", + "directions": 1 + }, + { + "name": "inhand-right-1", + "directions": 1 + }, + { + "name": "inhand-left-2", + "directions": 1 + }, + { + "name": "inhand-right-2", + "directions": 1 + }, + { + "name": "inhand-left-3", + "directions": 1 + }, + { + "name": "inhand-right-3", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Battery/taser.rsi/icon.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/icon.png new file mode 100644 index 0000000000..70d238e021 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/taser.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..bd2d61a7d1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..69ff0d19a7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..873959fad3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..bde8f5d01a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..72b1457fda Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/taser.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/taser.rsi/meta.json b/Resources/Textures/Objects/Guns/Battery/taser.rsi/meta.json new file mode 100644 index 0000000000..b6ae019734 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Battery/taser.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-unshaded-0", + "directions": 1, + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "mag-unshaded-4", + "directions": 1 + }, + { + "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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser0-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser0-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser0-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser0-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser0-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser0-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser0-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser0-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser1-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser1-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser1-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser1-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser1-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser1-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser1-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser1-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser2-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser2-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser2-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser2-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser2-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser2-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser2-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser2-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser3-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser3-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser3-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser3-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser3-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser3-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser3-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser3-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser4-inhand-left.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser4-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser4-inhand-left.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser4-inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser4-inhand-right.png b/Resources/Textures/Objects/Guns/Battery/taser.rsi/taser4-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Energy/taser.rsi/taser4-inhand-right.png rename to Resources/Textures/Objects/Guns/Battery/taser.rsi/taser4-inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/base.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/base.png new file mode 100644 index 0000000000..25d23bdf44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/icon.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/icon.png new file mode 100644 index 0000000000..0bf82be49f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/inhand-left.png new file mode 100644 index 0000000000..3dbae9e158 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/inhand-right.png new file mode 100644 index 0000000000..64056b3f1e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..44b5cc6a13 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..de4f425a66 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..04cc06f5cc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..31e3fd1716 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..83bc25892a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Battery/xray.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/Battery/xray.rsi/meta.json b/Resources/Textures/Objects/Guns/Battery/xray.rsi/meta.json new file mode 100644 index 0000000000..e2af81237c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Battery/xray.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-unshaded-0", + "directions": 1, + "delays": [ + [ + 0.3, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "mag-unshaded-4", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/meta.json b/Resources/Textures/Objects/Guns/Energy/taser.rsi/meta.json deleted file mode 100644 index 73dfae70cf..0000000000 --- a/Resources/Textures/Objects/Guns/Energy/taser.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "taser", "directions": 1, "delays": [[1.0]]}, {"name": "taser_charge", "directions": 1, "delays": [[1.0]]}, {"name": "taser_empty", "directions": 1, "delays": [[0.3, 0.3]]}, {"name": "taser0-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser0-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser1-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser1-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser2-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser2-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser3-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser3-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser4-inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "taser4-inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser_charge.png b/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser_charge.png deleted file mode 100644 index a1ff9fe33f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser_charge.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser_empty.png b/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser_empty.png deleted file mode 100644 index 1029d110f8..0000000000 Binary files a/Resources/Textures/Objects/Guns/Energy/taser.rsi/taser_empty.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/base.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/base.png new file mode 100644 index 0000000000..f6b988b3ab Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/bolt-closed.png new file mode 100644 index 0000000000..1dce2ac58d Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/bolt-open.png new file mode 100644 index 0000000000..11ffc0074b Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png rename to Resources/Textures/Objects/Guns/LMGs/l6.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-left.png index 7bbc73d7d7..b2c7e52a70 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-right.png index 2d20b938a4..ff7b866d73 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png deleted file mode 100644 index 2ed78d7823..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-1.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-1.png deleted file mode 100644 index 93a813859f..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png deleted file mode 100644 index 041dfc3ce2..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-3.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-3.png deleted file mode 100644 index 1309e4ab80..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6.png deleted file mode 100644 index c4979a921e..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-0.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-0.png new file mode 100644 index 0000000000..19948bd534 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-1.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-1.png new file mode 100644 index 0000000000..c8bad7153c Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-2.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-2.png new file mode 100644 index 0000000000..5f885994b8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-3.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-3.png new file mode 100644 index 0000000000..6d5a04cfbe Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json index afc4bc4bf4..a2c1c15790 100644 --- a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json @@ -8,94 +8,44 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi", "states": [ { - "name": "l6-4", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "icon", + "directions": 1 }, { - "name": "l6-3", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "base", + "directions": 1 }, { - "name": "l6-2", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "bolt-closed", + "directions": 1 }, { - "name": "l6-1", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "bolt-open", + "directions": 1 }, { - "name": "l6-0", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "mag-0", + "directions": 1 }, { - "name": "l6", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/base.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/base.png new file mode 100644 index 0000000000..866b826ca6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/bolt-closed.png new file mode 100644 index 0000000000..22ee7b1303 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/bolt-open.png new file mode 100644 index 0000000000..3e772bd763 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png rename to Resources/Textures/Objects/Guns/LMGs/pk.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-left.png index 7bbc73d7d7..1d7f7e2424 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-right.png index 2d20b938a4..511b579e4a 100644 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-0.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-0.png new file mode 100644 index 0000000000..e0229c2095 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-1.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-1.png new file mode 100644 index 0000000000..3114329ebc Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-2.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-2.png new file mode 100644 index 0000000000..4043c34852 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-3.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-3.png new file mode 100644 index 0000000000..bb4cb48ada Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-4.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-4.png new file mode 100644 index 0000000000..4a8b184454 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-5.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-5.png new file mode 100644 index 0000000000..c3a4498904 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json index 40d93884e8..9b1f40df53 100644 --- a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json @@ -8,94 +8,52 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/blob/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi", "states": [ { - "name": "pk-0", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "icon", + "directions": 1 }, { - "name": "pk-1", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "base", + "directions": 1 }, { - "name": "pk-2", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "bolt-closed", + "directions": 1 }, { - "name": "pk-3", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "bolt-open", + "directions": 1 }, { - "name": "pk-4", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "mag-0", + "directions": 1 }, { - "name": "pk", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "name": "mag-1", + "directions": 1 + }, + { + "name": "mag-2", + "directions": 1 + }, + { + "name": "mag-3", + "directions": 1 + }, + { + "name": "mag-4", + "directions": 1 + }, + { + "name": "mag-5", + "directions": 1 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png deleted file mode 100644 index 28d858a66d..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png deleted file mode 100644 index b67be31fe1..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png deleted file mode 100644 index 000ad1d308..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png deleted file mode 100644 index b73ea28783..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk.png deleted file mode 100644 index c5cc775277..0000000000 Binary files a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_0.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_0.png deleted file mode 100644 index ba4a9fe876..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_100.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_100.png deleted file mode 100644 index f4d02654d8..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_100.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_25.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_25.png deleted file mode 100644 index d0820af53e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_25.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_50.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_50.png deleted file mode 100644 index 3524024892..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_50.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_75.png b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_75.png deleted file mode 100644 index 020797c0f8..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/laser_cannon_75.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/meta.json deleted file mode 100644 index fdef41874e..0000000000 --- a/Resources/Textures/Objects/Guns/Laser/laser_cannon.rsi/meta.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "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": "laser_cannon", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_cannon_100", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_cannon_75", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_cannon_50", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_cannon_25", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_cannon_0", - "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] - ] - }, - { - "name": "0-inhand-left", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "0-inhand-right", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "25-inhand-left", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "25-inhand-right", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "50-inhand-left", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "50-inhand-right", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "75-inhand-left", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "75-inhand-right", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro.png deleted file mode 100644 index 8a12221de3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_0.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_0.png deleted file mode 100644 index 22ac15a8ab..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_100.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_100.png deleted file mode 100644 index 8a12221de3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_100.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_25.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_25.png deleted file mode 100644 index d93e4c6138..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_25.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_50.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_50.png deleted file mode 100644 index 9d29d82911..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_50.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_75.png b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_75.png deleted file mode 100644 index 67d7cdd75d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/laser_retro_75.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/meta.json b/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/meta.json deleted file mode 100644 index e2322df7dc..0000000000 --- a/Resources/Textures/Objects/Guns/Laser/laser_retro.rsi/meta.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "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": "laser_retro", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_retro_100", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_retro_75", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_retro_50", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_retro_25", - "directions": 1, - "delays": [ - [1.0] - ] - }, - { - "name": "laser_retro_0", - "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] - ] - }, - { - "name": "0-inhand-left", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "0-inhand-right", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "25-inhand-left", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "25-inhand-right", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "50-inhand-left", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "50-inhand-right", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "75-inhand-left", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - }, - { - "name": "75-inhand-right", - "directions": 4, - "delays": [ - [1.0], [1.0], [1.0], [1.0] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/base.png b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/base.png new file mode 100644 index 0000000000..ac612a2905 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/bolt-closed.png new file mode 100644 index 0000000000..e8a74ecac3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/bolt-open.png new file mode 100644 index 0000000000..91b1d16083 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/icon.png b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/icon.png new file mode 100644 index 0000000000..c7521b8d6e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/inhand-left.png new file mode 100644 index 0000000000..f1c11a36ae Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/inhand-right.png new file mode 100644 index 0000000000..e86e57d819 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/meta.json b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/meta.json new file mode 100644 index 0000000000..a50f1e74ab --- /dev/null +++ b/Resources/Textures/Objects/Guns/Launchers/china_lake.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/base.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/base.png new file mode 100644 index 0000000000..4350f73416 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/icon.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/icon.png new file mode 100644 index 0000000000..961cafcf83 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/inhand-left.png new file mode 100644 index 0000000000..ee156b3847 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/inhand-right.png new file mode 100644 index 0000000000..b6b6da5da6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-0.png new file mode 100644 index 0000000000..7ef2a79205 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-1.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-1.png new file mode 100644 index 0000000000..7ef2a79205 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/meta.json b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/meta.json new file mode 100644 index 0000000000..69eaa07a35 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "rocket0-inhand-left", + "directions": 4 + }, + { + "name": "rocket0-inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png new file mode 100644 index 0000000000..aa36fdfe14 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png new file mode 100644 index 0000000000..c988a13565 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Launchers/rocket.rsi/rocket0-inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/base.png new file mode 100644 index 0000000000..4ff228d54d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/bolt-closed.png new file mode 100644 index 0000000000..06018a260a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/bolt-open.png new file mode 100644 index 0000000000..8d0fc07b3d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-0.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-0.png deleted file mode 100644 index c6bc7d90a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa.png deleted file mode 100644 index 263beda755..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/icon.png new file mode 100644 index 0000000000..734b440148 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-left.png index 7bbc73d7d7..54aa5d121f 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-right.png index 2d20b938a4..e7c52b5bb4 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/mag-0.png new file mode 100644 index 0000000000..48b8aeedc7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/meta.json index dfda2f23d9..ae0fe69106 100644 --- a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/meta.json @@ -5,51 +5,35 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/clarissa.dmi", "states": [ { - "name": "clarissa", + "name": "icon", "directions": 1 }, { - "name": "clarissa-0", + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", "directions": 1 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/suppressor.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/suppressor.png new file mode 100644 index 0000000000..746f89d958 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s-0.png b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s-0.png deleted file mode 100644 index 85cf594a7a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s.png b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s.png deleted file mode 100644 index b04dd7b896..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/meta.json deleted file mode 100644 index cdc1622237..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/meta.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "clarissa_s", - "directions": 1 - }, - { - "name": "clarissa_s-0", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/colt.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/base.png new file mode 100644 index 0000000000..d58066f863 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/colt.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/bolt-closed.png new file mode 100644 index 0000000000..470890b4d5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/colt.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/bolt-open.png new file mode 100644 index 0000000000..8d3814e87f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/colt.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/icon.png new file mode 100644 index 0000000000..b897c3fa36 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/colt.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/inhand-left.png new file mode 100644 index 0000000000..4de85760c5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/colt.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/inhand-right.png new file mode 100644 index 0000000000..56eaeab03e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/colt.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/meta.json new file mode 100644 index 0000000000..92d1385f04 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/colt.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle-0.png b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle-0.png deleted file mode 100644 index 898f13e880..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle.png b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle.png deleted file mode 100644 index 1d374c40aa..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/meta.json deleted file mode 100644 index 9dd213f237..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/meta.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "deagle", - "directions": 1 - }, - { - "name": "deagle-0", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-0.png b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-0.png deleted file mode 100644 index 8f8ff842e6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-1.png b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-1.png deleted file mode 100644 index 2dba7a387c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard.png b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard.png deleted file mode 100644 index 69aecf9f15..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/base.png new file mode 100644 index 0000000000..1d83d064b9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/bolt-closed.png new file mode 100644 index 0000000000..116439f091 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/bolt-open.png new file mode 100644 index 0000000000..b327442a10 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-0.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-0.png deleted file mode 100644 index 92de30d271..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard.png deleted file mode 100644 index b5bc2ab4ad..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-1.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-1.png rename to Resources/Textures/Objects/Guns/Pistols/giskard.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-left.png index 7bbc73d7d7..54aa5d121f 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-right.png index 2d20b938a4..e7c52b5bb4 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/mag-0.png new file mode 100644 index 0000000000..724f99801a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/meta.json index aff3c60427..0f80341882 100644 --- a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/meta.json @@ -8,52 +8,36 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [ { - "name": "giskard", + "name": "icon", "directions": 1 }, { - "name": "giskard-0", + "name": "base", "directions": 1 }, { - "name": "giskard-1", + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "suppressor", "directions": 1 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/suppressor.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/suppressor.png new file mode 100644 index 0000000000..b49399ca9c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-0.png b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-0.png deleted file mode 100644 index 090a187300..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-1.png b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-1.png deleted file mode 100644 index 8cf5cdf58f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s.png b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s.png deleted file mode 100644 index ac91a54213..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/meta.json deleted file mode 100644 index 1e3934729d..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/meta.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "giskard_s", - "directions": 1 - }, - { - "name": "giskard_s-0", - "directions": 1 - }, - { - "name": "giskard_s-1", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/base.png new file mode 100644 index 0000000000..98301721e3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/icon.png new file mode 100644 index 0000000000..97aabcc192 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/inhand-left.png new file mode 100644 index 0000000000..47cc18b070 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/inhand-right.png new file mode 100644 index 0000000000..e356ed4da5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/mag-0.png new file mode 100644 index 0000000000..e589e3f172 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/meta.json new file mode 100644 index 0000000000..f93283c4a1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/gyro_pistol.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol-0.png b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol-0.png deleted file mode 100644 index 2ef463592c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol.png b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol.png deleted file mode 100644 index 126536e145..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/meta.json deleted file mode 100644 index f1fc240a94..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/meta.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "gyropistol", - "directions": 1 - }, - { - "name": "gyropistol-0", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/base.png new file mode 100644 index 0000000000..d5b22cb67f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/bolt-closed.png new file mode 100644 index 0000000000..4531e00b89 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/bolt-open.png new file mode 100644 index 0000000000..8880ce7b61 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/icon.png new file mode 100644 index 0000000000..24d058e1d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/inhand-left.png new file mode 100644 index 0000000000..54aa5d121f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/inhand-right.png new file mode 100644 index 0000000000..e7c52b5bb4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/meta.json new file mode 100644 index 0000000000..e9663d81f0 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/hm_pistol.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-0.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-0.png deleted file mode 100644 index 9a8636f796..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-1.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-1.png deleted file mode 100644 index ad129e2d19..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp.png deleted file mode 100644 index 15acfe3c7e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/meta.json deleted file mode 100644 index 2b8732ea85..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/meta.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "ih_mp", - "directions": 1 - }, - { - "name": "ih_mp-0", - "directions": 1 - }, - { - "name": "ih_mp-1", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s-0.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s-0.png deleted file mode 100644 index c9d5695912..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s-1.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s-1.png deleted file mode 100644 index 4e59390fef..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s.png deleted file mode 100644 index bca0df9826..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/meta.json deleted file mode 100644 index 00c8ced373..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/meta.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "ih_mp_s", - "directions": 1 - }, - { - "name": "ih_mp_s-0", - "directions": 1 - }, - { - "name": "ih_mp_s-1", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm-0.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm-0.png deleted file mode 100644 index 628d443caf..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm-1.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm-1.png deleted file mode 100644 index d58186238b..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm.png deleted file mode 100644 index 5bdccc1577..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/meta.json deleted file mode 100644 index 8705a4dadf..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/meta.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "ih_sidearm", - "directions": 1 - }, - { - "name": "ih_sidearm-0", - "directions": 1 - }, - { - "name": "ih_sidearm-1", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s-0.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s-0.png deleted file mode 100644 index 4208379ff8..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s-1.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s-1.png deleted file mode 100644 index aee0f34cf5..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s.png deleted file mode 100644 index 2d0d720e46..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/meta.json deleted file mode 100644 index 8f2120694b..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/meta.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "ih_sidearm_s", - "directions": 1 - }, - { - "name": "ih_sidearm_s-0", - "directions": 1 - }, - { - "name": "ih_sidearm_s-1", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/base-unshaded.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/base-unshaded.png new file mode 100644 index 0000000000..4d77cd9b9e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/base-unshaded.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/base.png new file mode 100644 index 0000000000..9066e933a3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/icon.png new file mode 100644 index 0000000000..da0c2b0fcf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-left.png index 7bbc73d7d7..f43f7e219e 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-right.png index 2d20b938a4..3e45080bed 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia-0.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia-0.png deleted file mode 100644 index 4093c17209..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia-1.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia-1.png deleted file mode 100644 index af40a26bdd..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia.png deleted file mode 100644 index 494f07bff9..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-0.png new file mode 100644 index 0000000000..dc086c8897 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..d3ffebb9e3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..365d962d29 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..1a0487dc3c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..b8111fbe9c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/meta.json index 96f0fd3157..ac22c64f2e 100644 --- a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/meta.json @@ -1 +1,51 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "lamia", "directions": 1}, {"name": "lamia-0", "directions": 1}, {"name": "lamia-1", "directions": 1}, {"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, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "base-unshaded", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "mag-unshaded-4", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov-0.png b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov-0.png deleted file mode 100644 index a1c55d2e25..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov.png b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov.png deleted file mode 100644 index a1c55d2e25..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/meta.json deleted file mode 100644 index 9655451540..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/meta.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "makarov", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "makarov-0", - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/makarov_s-0.png b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/makarov_s-0.png deleted file mode 100644 index 228e2c2277..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/makarov_s-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/makarov_s.png b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/makarov_s.png deleted file mode 100644 index 228e2c2277..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/makarov_s.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/meta.json deleted file mode 100644 index 00fa3b08a2..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/meta.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "makarov_s", - "directions": 1 - }, - { - "name": "makarov_s-0", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/base.png new file mode 100644 index 0000000000..1d37db3ba4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/bolt-closed.png new file mode 100644 index 0000000000..6b7b141b02 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/bolt-open.png new file mode 100644 index 0000000000..be5bfd5320 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/icon.png new file mode 100644 index 0000000000..cba29786b9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/inhand-left.png new file mode 100644 index 0000000000..ddabaffad2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/inhand-right.png new file mode 100644 index 0000000000..4b1d8778e0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/mag-0.png new file mode 100644 index 0000000000..7372c37a8d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/meta.json new file mode 100644 index 0000000000..bd92c94d9d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/mandella.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/base.png new file mode 100644 index 0000000000..f086ea116e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/bolt-closed.png new file mode 100644 index 0000000000..814e3528d3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/bolt-open.png new file mode 100644 index 0000000000..79aa19c521 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-1.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-1.png rename to Resources/Textures/Objects/Guns/Pistols/mk58.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-left.png index 7bbc73d7d7..54aa5d121f 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-right.png index 2d20b938a4..e7c52b5bb4 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mag-0.png new file mode 100644 index 0000000000..adb9b06292 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/meta.json index d1978dbdc2..c1f957d2b6 100644 --- a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/meta.json @@ -8,52 +8,28 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [ { - "name": "mk58", + "name": "icon", "directions": 1 }, { - "name": "mk58-0", + "name": "base", "directions": 1 }, { - "name": "mk58-1", + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", "directions": 1 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-0.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-0.png deleted file mode 100644 index e31a3302b8..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58.png deleted file mode 100644 index 5dd69bbb3c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/base.png new file mode 100644 index 0000000000..d54611c012 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/bolt-closed.png new file mode 100644 index 0000000000..1e1577878f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/bolt-open.png new file mode 100644 index 0000000000..c69443f80e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/icon.png new file mode 100644 index 0000000000..7f0a5b2871 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/inhand-left.png index 7bbc73d7d7..54aa5d121f 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/inhand-right.png index 2d20b938a4..e7c52b5bb4 100644 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mag-0.png new file mode 100644 index 0000000000..eeb9dc6de9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/meta.json index 1ec0a4652c..c1f957d2b6 100644 --- a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/meta.json @@ -1 +1,35 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "mk58_wood", "directions": 1}, {"name": "mk58_wood-0", "directions": 1}, {"name": "mk58_wood-1", "directions": 1}, {"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, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood-0.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood-0.png deleted file mode 100644 index c60dabf0f6..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood-1.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood-1.png deleted file mode 100644 index 271a3c44d0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood.png b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood.png deleted file mode 100644 index 283b4eb54d..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/base.png new file mode 100644 index 0000000000..cb6628d20c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/bolt-closed.png new file mode 100644 index 0000000000..e08c797e9a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/bolt-open.png new file mode 100644 index 0000000000..1e36e193df Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/icon.png new file mode 100644 index 0000000000..017d500b7d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/inhand-left.png new file mode 100644 index 0000000000..db86efaafd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/inhand-right.png new file mode 100644 index 0000000000..0b4e71bcd0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/mag-0.png new file mode 100644 index 0000000000..1190f0ec2f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/meta.json new file mode 100644 index 0000000000..5397bc1bbd --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "suppressor", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/molly.rsi/suppressor.png b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/suppressor.png new file mode 100644 index 0000000000..c8188820f6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/molly.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/base.png new file mode 100644 index 0000000000..d37194554c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/bolt-closed.png new file mode 100644 index 0000000000..e4b0ab94f7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/bolt-open.png new file mode 100644 index 0000000000..f89bdab2eb Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil-0.png b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil-0.png rename to Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-left.png rename to Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-right.png rename to Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/meta.json similarity index 90% rename from Resources/Textures/Objects/Guns/Pistols/deckard.rsi/meta.json rename to Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/meta.json index 31291f1f56..cff83b950e 100644 --- a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Pistols/olivaw_civil.rsi/meta.json @@ -8,19 +8,19 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [ { - "name": "deckard", + "name": "icon", "directions": 1 }, { - "name": "deckard-0", + "name": "base", "directions": 1 }, { - "name": "deckard-1", + "name": "bolt-closed", "directions": 1 }, { - "name": "deckard-2", + "name": "bolt-open", "directions": 1 }, { diff --git a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/meta.json deleted file mode 100644 index b16c6c67f7..0000000000 --- a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "olivawcivil", "directions": 1}, {"name": "olivawcivil-0", "directions": 1}, {"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 diff --git a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil.png b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil.png deleted file mode 100644 index 50f3e731ea..0000000000 Binary files a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/base.png b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/base.png new file mode 100644 index 0000000000..20c55074c9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/bolt-closed.png new file mode 100644 index 0000000000..7c3ccb0ef0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/bolt-open.png new file mode 100644 index 0000000000..a910690554 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/icon.png b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/icon.png new file mode 100644 index 0000000000..30fa1fd93e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/inhand-left.png new file mode 100644 index 0000000000..9d44a85633 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/inhand-right.png new file mode 100644 index 0000000000..0a71097c13 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/mag-0.png new file mode 100644 index 0000000000..90a4ad9621 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/meta.json new file mode 100644 index 0000000000..4df90a8240 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "suppressor", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Pistols/paco.rsi/suppressor.png b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/suppressor.png new file mode 100644 index 0000000000..e7decdc7ca Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/paco.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/buckshot.rsi/base.png b/Resources/Textures/Objects/Guns/Projectiles/buckshot.rsi/base.png new file mode 100644 index 0000000000..e155cfbb1b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/buckshot.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/buckshot.rsi/meta.json b/Resources/Textures/Objects/Guns/Projectiles/buckshot.rsi/meta.json new file mode 100644 index 0000000000..608fd7f7f7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Projectiles/buckshot.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "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", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Projectiles/bullet.rsi/bullet.png b/Resources/Textures/Objects/Guns/Projectiles/bullet.rsi/bullet.png new file mode 100644 index 0000000000..90081eec89 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/bullet.rsi/bullet.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/bullet.rsi/meta.json b/Resources/Textures/Objects/Guns/Projectiles/bullet.rsi/meta.json new file mode 100644 index 0000000000..6e7940bc1a --- /dev/null +++ b/Resources/Textures/Objects/Guns/Projectiles/bullet.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "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", + "directions": 1, + "delays": [ + [ + 0.05, + 0.05 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Projectiles/bullet_muzzle.png b/Resources/Textures/Objects/Guns/Projectiles/bullet_muzzle.png new file mode 100644 index 0000000000..6985d3b1ca Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/bullet_muzzle.png differ diff --git a/Resources/Textures/Objects/Projectiles/copyright.json b/Resources/Textures/Objects/Guns/Projectiles/copyright.json similarity index 100% rename from Resources/Textures/Objects/Projectiles/copyright.json rename to Resources/Textures/Objects/Guns/Projectiles/copyright.json diff --git a/Resources/Textures/Objects/Guns/Projectiles/grenade.rsi/grenade.png b/Resources/Textures/Objects/Guns/Projectiles/grenade.rsi/grenade.png new file mode 100644 index 0000000000..649683ff2c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/grenade.rsi/grenade.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/grenade.rsi/meta.json b/Resources/Textures/Objects/Guns/Projectiles/grenade.rsi/meta.json new file mode 100644 index 0000000000..45446bc434 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Projectiles/grenade.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "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", + "directions": 1, + "delays": [ + [ + 0.05, + 0.05 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Projectiles/heavy_laser.png b/Resources/Textures/Objects/Guns/Projectiles/heavy_laser.png new file mode 100644 index 0000000000..abd70d245b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/heavy_laser.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/heavy_laser_impact.png b/Resources/Textures/Objects/Guns/Projectiles/heavy_laser_impact.png new file mode 100644 index 0000000000..16ef14f51b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/heavy_laser_impact.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/heavy_laser_muzzle.png b/Resources/Textures/Objects/Guns/Projectiles/heavy_laser_muzzle.png new file mode 100644 index 0000000000..5c20948001 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/heavy_laser_muzzle.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/laser.png b/Resources/Textures/Objects/Guns/Projectiles/laser.png new file mode 100644 index 0000000000..2fb520b365 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/laser.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/laser_impact.png b/Resources/Textures/Objects/Guns/Projectiles/laser_impact.png new file mode 100644 index 0000000000..6d51ffdd01 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/laser_impact.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/laser_muzzle.png b/Resources/Textures/Objects/Guns/Projectiles/laser_muzzle.png new file mode 100644 index 0000000000..b974770f0a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/laser_muzzle.png differ diff --git a/Resources/Textures/Objects/Projectiles/plasma.png b/Resources/Textures/Objects/Guns/Projectiles/plasma.png similarity index 100% rename from Resources/Textures/Objects/Projectiles/plasma.png rename to Resources/Textures/Objects/Guns/Projectiles/plasma.png diff --git a/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/frag.png b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/frag.png new file mode 100644 index 0000000000..93251cdc2f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/frag.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/meta.json b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/meta.json new file mode 100644 index 0000000000..cb29fe71ba --- /dev/null +++ b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "smallfrag", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/smallfrag.png b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/smallfrag.png new file mode 100644 index 0000000000..504580ce49 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/rocket.rsi/smallfrag.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/slug.rsi/base.png b/Resources/Textures/Objects/Guns/Projectiles/slug.rsi/base.png new file mode 100644 index 0000000000..a36175d8fa Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/slug.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/slug.rsi/meta.json b/Resources/Textures/Objects/Guns/Projectiles/slug.rsi/meta.json new file mode 100644 index 0000000000..608fd7f7f7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Projectiles/slug.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "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", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Projectiles/spark.rsi/meta.json b/Resources/Textures/Objects/Guns/Projectiles/spark.rsi/meta.json new file mode 100644 index 0000000000..89b4a9b47e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Projectiles/spark.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "GPL3", + "copyright": "https://github.com/tgstation/tgstation/raw/64e5682495a3d3383546b3bfcd4732c32f09b419/icons/obj/projectiles.dmi", + "states": [ + { + "name": "spark", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Projectiles/spark.rsi/spark.png b/Resources/Textures/Objects/Guns/Projectiles/spark.rsi/spark.png new file mode 100644 index 0000000000..31b7ffdd96 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/spark.rsi/spark.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/xray.png b/Resources/Textures/Objects/Guns/Projectiles/xray.png new file mode 100644 index 0000000000..081c9cdfdf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/xray.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/xray_impact.png b/Resources/Textures/Objects/Guns/Projectiles/xray_impact.png new file mode 100644 index 0000000000..fcd395713f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/xray_impact.png differ diff --git a/Resources/Textures/Objects/Guns/Projectiles/xray_muzzle.png b/Resources/Textures/Objects/Guns/Projectiles/xray_muzzle.png new file mode 100644 index 0000000000..32422e111f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Projectiles/xray_muzzle.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/base.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/base.png new file mode 100644 index 0000000000..6d733331b3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/bolt-closed.png new file mode 100644 index 0000000000..23ef2df5f9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/bolt-open.png new file mode 100644 index 0000000000..915ccf8f95 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-2.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-2.png rename to Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/inhand-left.png new file mode 100644 index 0000000000..90f2b9ad25 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/inhand-right.png new file mode 100644 index 0000000000..53b5b1bcfd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..3fcd561533 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..f999b28555 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..066d199870 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..09dc6373bc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/meta.json b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/meta.json new file mode 100644 index 0000000000..5b99a397bd --- /dev/null +++ b/Resources/Textures/Objects/Guns/Revolvers/deckard.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-unshaded-0", + "directions": 1 + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector-0.png b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector-0.png rename to Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-left.png index 7bbc73d7d7..90f2b9ad25 100644 Binary files a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-right.png index 2d20b938a4..53b5b1bcfd 100644 Binary files a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector.png b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector.png deleted file mode 100644 index 1fcff2d6a1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/meta.json index f32d398064..7e2369001c 100644 --- a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/meta.json @@ -8,11 +8,7 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [ { - "name": "inspector", - "directions": 1 - }, - { - "name": "inspector-0", + "name": "icon", "directions": 1 }, { diff --git a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/icon.png b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/icon.png new file mode 100644 index 0000000000..93ed9b1ca1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-left.png index 7bbc73d7d7..16fabfe532 100644 Binary files a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-right.png index 2d20b938a4..0984eeec2c 100644 Binary files a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba-0.png b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba-0.png deleted file mode 100644 index 4ab02b8fe0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba.png b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba.png deleted file mode 100644 index 4ab02b8fe0..0000000000 Binary files a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/meta.json index 3ec8c6a4b3..7e2369001c 100644 --- a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/meta.json @@ -8,11 +8,7 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [ { - "name": "mateba", - "directions": 1 - }, - { - "name": "mateba-0", + "name": "icon", "directions": 1 }, { diff --git a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/meta.json b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/meta.json deleted file mode 100644 index 66b288609f..0000000000 --- a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/meta.json +++ /dev/null @@ -1,74 +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/guns/projectile.dmi", - "states": [ - { - "name": "revolver", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "revolver-0", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "revolver-1", - "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 diff --git a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver-0.png b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver-0.png deleted file mode 100644 index 0ebb1d4450..0000000000 Binary files a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver-1.png b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver-1.png deleted file mode 100644 index eab616dbd1..0000000000 Binary files a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver.png b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver.png deleted file mode 100644 index 0ebb1d4450..0000000000 Binary files a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak.png rename to Resources/Textures/Objects/Guns/Rifles/ak.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png rename to Resources/Textures/Objects/Guns/Rifles/ak.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-left.png index 7bbc73d7d7..d1a09d7641 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-right.png index 2d20b938a4..0194f92a43 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/mag-0.png new file mode 100644 index 0000000000..e0fa683783 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json index cfc00ed2c9..29026e680b 100644 --- a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json @@ -8,48 +8,24 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [ { - "name": "ak", + "name": "icon", "directions": 1 }, { - "name": "ak-0", + "name": "base", + "directions": 1 + }, + { + "name": "mag-0", "directions": 1 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/meta.json deleted file mode 100644 index 78bd89589a..0000000000 --- a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/meta.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "black-ak", - "directions": 1 - }, - { - "name": "black-ak-0", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak.png b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak.png rename to Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png rename to Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/inhand-left.png new file mode 100644 index 0000000000..a1283b3db4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/inhand-right.png new file mode 100644 index 0000000000..ba647e547f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/mag-0.png new file mode 100644 index 0000000000..df4b968d1e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/meta.json new file mode 100644 index 0000000000..29026e680b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/black_ak.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/base.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/base.png new file mode 100644 index 0000000000..52259c81d8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/bolt-closed.png new file mode 100644 index 0000000000..b4b6e3edb9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/bolt-open.png new file mode 100644 index 0000000000..beb4a7c63e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-0.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-0.png deleted file mode 100644 index 3af7b68975..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-1.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-1.png deleted file mode 100644 index 3af7b68975..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-2.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-2.png deleted file mode 100644 index 51f9df6f22..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-3.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-3.png deleted file mode 100644 index 51f9df6f22..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-4.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-4.png deleted file mode 100644 index 51f9df6f22..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-5.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-5.png deleted file mode 100644 index 51f9df6f22..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine.png deleted file mode 100644 index 2adde5e87e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/icon.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/icon.png new file mode 100644 index 0000000000..f8e82b4bfd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-left.png index 7bbc73d7d7..a9c3df1c46 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-right.png index 2d20b938a4..e5fe120db1 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/mag-0.png new file mode 100644 index 0000000000..5571052625 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/meta.json index 72dce6fd98..d6f6cc25c6 100644 --- a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/meta.json @@ -1 +1,39 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "carbine", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "carbine-0", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "carbine-1", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "carbine-2", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "carbine-3", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "carbine-4", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "carbine-5", "directions": 1, "delays": [[1.0, 3.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, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas.png b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas.png rename to Resources/Textures/Objects/Guns/Rifles/dallas.rsi/base.png diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas-0.png b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas-0.png rename to Resources/Textures/Objects/Guns/Rifles/dallas.rsi/icon.png diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-left.png index 7bbc73d7d7..0f3da940e8 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-right.png index 2d20b938a4..f475a9817e 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/mag-0.png new file mode 100644 index 0000000000..596fbb9bbe Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/meta.json index 9305b8de2c..29026e680b 100644 --- a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/meta.json @@ -1 +1,31 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "dallas", "directions": 1}, {"name": "dallas-0", "directions": 1}, {"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, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/ih_heavyrifle-0.png b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/ih_heavyrifle-0.png deleted file mode 100644 index 1d2369a576..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/ih_heavyrifle-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/ih_heavyrifle.png b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/ih_heavyrifle.png deleted file mode 100644 index 31e4347e9f..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/ih_heavyrifle.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/meta.json deleted file mode 100644 index a8c1e0e2a4..0000000000 --- a/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "ih_heavyrifle", "directions": 1}, {"name": "ih_heavyrifle-0", "directions": 1}, {"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 diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/meta.json deleted file mode 100644 index add01031c8..0000000000 --- a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/meta.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "sol-eot", - "directions": 1 - }, - { - "name": "sol-eot-0", - "directions": 1 - }, - { - "name": "sol-eot-1", - "directions": 1 - }, - { - "name": "sol-eot-2", - "directions": 1 - }, - { - "name": "sol-eot-3", - "directions": 1 - }, - { - "name": "sol-eot-3", - "directions": 1 - }, - { - "name": "sol-eot-4", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-0.png b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-0.png deleted file mode 100644 index d1c741d04e..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-1.png b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-1.png deleted file mode 100644 index f07eef5541..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-2.png b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-2.png deleted file mode 100644 index 3d06da1f0a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-3.png b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-3.png deleted file mode 100644 index 1455b7cac7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-4.png b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-4.png deleted file mode 100644 index f67fcd4f28..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot.png b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot.png deleted file mode 100644 index a9468b30a2..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/meta.json deleted file mode 100644 index 4c38319c87..0000000000 --- a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/meta.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "sol-para", - "directions": 1 - }, - { - "name": "sol-para-0", - "directions": 1 - }, - { - "name": "sol-para-1", - "directions": 1 - }, - { - "name": "sol-para-2", - "directions": 1 - }, - { - "name": "sol-para-3", - "directions": 1 - }, - { - "name": "sol-para-4", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-0.png b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-0.png deleted file mode 100644 index e33f85d648..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-1.png b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-1.png deleted file mode 100644 index 01e44c65eb..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-2.png b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-2.png deleted file mode 100644 index b02006ccd3..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-3.png b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-3.png deleted file mode 100644 index 225698822a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-4.png b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-4.png deleted file mode 100644 index a143c26997..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para.png b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para.png deleted file mode 100644 index 70c16dab6c..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/base.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/base.png new file mode 100644 index 0000000000..16e1c0f992 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/bolt-closed.png new file mode 100644 index 0000000000..09eba34d85 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/bolt-open.png new file mode 100644 index 0000000000..85fc15d882 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/icon.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/icon.png new file mode 100644 index 0000000000..9e9c202e78 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-left.png index 7bbc73d7d7..c587af43e4 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-right.png index 2d20b938a4..123755e969 100644 Binary files a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/mag-0.png new file mode 100644 index 0000000000..f2c64aac25 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json index edd5e68dc4..7e99a9afa6 100644 --- a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json @@ -8,48 +8,32 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [ { - "name": "sts", + "name": "icon", "directions": 1 }, { - "name": "sts-0", + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", "directions": 1 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png deleted file mode 100644 index 8c5ff49faa..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts.png deleted file mode 100644 index 0070268e9a..0000000000 Binary files a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/base.png b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/base.png new file mode 100644 index 0000000000..56471e039a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/bolt-closed.png new file mode 100644 index 0000000000..bcfbb302cd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/bolt-open.png new file mode 100644 index 0000000000..b6abedda93 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/icon.png b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/icon.png new file mode 100644 index 0000000000..1a815703a2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/inhand-left.png new file mode 100644 index 0000000000..73614c4c7b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/inhand-right.png new file mode 100644 index 0000000000..4014cc755c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/mag-0.png new file mode 100644 index 0000000000..d33bf79e16 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/meta.json new file mode 100644 index 0000000000..5f16983ab2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/vintorez.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/base.png b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/base.png new file mode 100644 index 0000000000..4a082bc717 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/bolt-closed.png new file mode 100644 index 0000000000..fa4e700d15 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/bolt-open.png new file mode 100644 index 0000000000..a485e6abdf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/icon.png b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/icon.png new file mode 100644 index 0000000000..c2013d076f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/inhand-left.png new file mode 100644 index 0000000000..ddb5492a30 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/inhand-right.png new file mode 100644 index 0000000000..087765417c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/mag-0.png new file mode 100644 index 0000000000..5391875ca7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/meta.json new file mode 100644 index 0000000000..a9bf6e1e06 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/wintermute.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/base.png b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/base.png new file mode 100644 index 0000000000..1b4a0041ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/bolt-closed.png new file mode 100644 index 0000000000..46f4cb7541 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/bolt-open.png new file mode 100644 index 0000000000..40ae4d7727 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/icon.png b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/icon.png new file mode 100644 index 0000000000..1cd8e86749 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/inhand-left.png new file mode 100644 index 0000000000..455e70980d Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/inhand-right.png new file mode 100644 index 0000000000..aaa18fc3c4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/mag-0.png b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/mag-0.png new file mode 100644 index 0000000000..fcc6d35c59 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/meta.json new file mode 100644 index 0000000000..2c138e791b --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "suppressor", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/suppressor.png b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/suppressor.png new file mode 100644 index 0000000000..0e988d5349 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/atreides.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/base.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/base.png new file mode 100644 index 0000000000..632252a489 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/bolt-closed.png new file mode 100644 index 0000000000..97ad5eccbe Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/bolt-open.png new file mode 100644 index 0000000000..792dbb707a Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-0.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-0.png deleted file mode 100644 index 7acd1397bf..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-1.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-1.png deleted file mode 100644 index 29a2fde1f2..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-2.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-2.png deleted file mode 100644 index a0acaf09f6..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-3.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-3.png deleted file mode 100644 index 90c4a68509..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-4.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-4.png deleted file mode 100644 index a3ecf32636..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-5.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-5.png deleted file mode 100644 index 426af2d4d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r.png deleted file mode 100644 index 16fb3a3b6f..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/icon.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/icon.png new file mode 100644 index 0000000000..b60d27bd88 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-left.png index 7bbc73d7d7..b1c4a2855d 100644 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-left.png and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-right.png index 2d20b938a4..4bbb47e4f0 100644 Binary files a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-right.png and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/mag-0.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/mag-0.png new file mode 100644 index 0000000000..116705eccd Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/meta.json index b243c2673d..0b353cb836 100644 --- a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/meta.json @@ -1 +1,43 @@ -{"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": "c20r", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-0", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-3", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-4", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-5", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-1", "directions": 1, "delays": [[1.0]]}, {"name": "c20r-2", "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, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "suppressor", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/suppressor.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/suppressor.png new file mode 100644 index 0000000000..e8c38e9e52 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/base.png b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/base.png new file mode 100644 index 0000000000..2e654b42f5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/bolt-closed.png new file mode 100644 index 0000000000..b85461ce7e Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/bolt-open.png new file mode 100644 index 0000000000..af59962c8c Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/icon.png b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/icon.png new file mode 100644 index 0000000000..08153449cf Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/inhand-left.png new file mode 100644 index 0000000000..eec6989c94 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/inhand-right.png new file mode 100644 index 0000000000..535242e776 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/mag-0.png b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/mag-0.png new file mode 100644 index 0000000000..f909b598e7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/meta.json new file mode 100644 index 0000000000..264561a698 --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "suppressor", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/suppressor.png b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/suppressor.png new file mode 100644 index 0000000000..b3af6f6867 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/drozd.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/ih_smg-0.png b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/ih_smg-0.png deleted file mode 100644 index 5110bb0347..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/ih_smg-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/ih_smg.png b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/ih_smg.png deleted file mode 100644 index 68b3a6483e..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/ih_smg.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/meta.json deleted file mode 100644 index 337d8eda24..0000000000 --- a/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/meta.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "ih_smg", - "directions": 1 - }, - { - "name": "ih_smg-0", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/ih_smg_s-0.png b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/ih_smg_s-0.png deleted file mode 100644 index 6117bf465d..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/ih_smg_s-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/ih_smg_s.png b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/ih_smg_s.png deleted file mode 100644 index 262684aefb..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/ih_smg_s.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/meta.json deleted file mode 100644 index 894acc6aa3..0000000000 --- a/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/meta.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", - "states": [ - { - "name": "ih_smg_s", - "directions": 1 - }, - { - "name": "ih_smg_s-0", - "directions": 1 - }, - { - "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 diff --git a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac-0.png b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac-0.png deleted file mode 100644 index d6a113300e..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac.png b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac.png deleted file mode 100644 index 03d8e32ca5..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/meta.json deleted file mode 100644 index 6d9778df3f..0000000000 --- a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "mac", "directions": 1}, {"name": "mac-0", "directions": 1}, {"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 diff --git a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/inhand-left.png deleted file mode 100644 index 7bbc73d7d7..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/inhand-right.png deleted file mode 100644 index 2d20b938a4..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/meta.json deleted file mode 100644 index 2ea3b35fe7..0000000000 --- a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "saber", "directions": 1}, {"name": "saber-0", "directions": 1}, {"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 diff --git a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber-0.png b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber-0.png deleted file mode 100644 index 049318f1e2..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber.png b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber.png deleted file mode 100644 index 14a3426af3..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/base.png b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/base.png new file mode 100644 index 0000000000..794d4e022b Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/bolt-closed.png new file mode 100644 index 0000000000..ce4dd70da4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/bolt-open.png new file mode 100644 index 0000000000..a9d9bc1dc6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/icon.png b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/icon.png new file mode 100644 index 0000000000..06979e4257 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/inhand-left.png new file mode 100644 index 0000000000..5e69c0449e Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/inhand-right.png new file mode 100644 index 0000000000..b410d99e34 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/mag-0.png b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/mag-0.png new file mode 100644 index 0000000000..d3cbb7bdd5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/meta.json new file mode 100644 index 0000000000..a7200507ee --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/straylight.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "suppressor", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 1 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/suppressor.png b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/suppressor.png new file mode 100644 index 0000000000..079d5a45d9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/straylight.rsi/suppressor.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/base-unshaded.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/base-unshaded.png new file mode 100644 index 0000000000..a6e4294141 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/base-unshaded.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/base.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/base.png new file mode 100644 index 0000000000..431463ab53 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/icon.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/icon.png new file mode 100644 index 0000000000..3d56f4cd5a Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-0.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-0.png new file mode 100644 index 0000000000..b169a8e602 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-1.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-1.png new file mode 100644 index 0000000000..d740a3cdf6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-2.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-2.png new file mode 100644 index 0000000000..5db0c5da96 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-3.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-3.png new file mode 100644 index 0000000000..e506cb723c Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-4.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-4.png new file mode 100644 index 0000000000..e9a781f631 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-5.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-5.png new file mode 100644 index 0000000000..453fa22def Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..17293d36c7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..7bf54a2750 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..061cec9f46 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..c4c08d6081 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..9f90e0368e Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-5.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-5.png new file mode 100644 index 0000000000..4801875371 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/mag-unshaded-5.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/meta.json index 1e3ec25a06..90e48734f0 100644 --- a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/meta.json +++ b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/meta.json @@ -1 +1,163 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "wt550", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "wt550-0", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "wt550-1", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "wt550-2", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "wt550-3", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "wt550-4", "directions": 1, "delays": [[1.0, 3.0]]}, {"name": "wt550-5", "directions": 1, "delays": [[1.0, 3.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, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "base", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "base-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-0", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-0", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-1", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-1", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-2", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-2", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-3", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-3", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-4", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-4", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-5", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "mag-unshaded-5", + "directions": 1, + "delays": [ + [ + 0.1, + 0.3 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-0.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-0.png deleted file mode 100644 index 98f78cdcba..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-1.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-1.png deleted file mode 100644 index c13cb6744f..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-2.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-2.png deleted file mode 100644 index e2399b3877..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-3.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-3.png deleted file mode 100644 index dede95b8b9..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-4.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-4.png deleted file mode 100644 index d0fad12c39..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-5.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-5.png deleted file mode 100644 index 4fffada3c9..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550.png deleted file mode 100644 index a1ae4339c1..0000000000 Binary files a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550.png and /dev/null differ diff --git a/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/base.png b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/base.png new file mode 100644 index 0000000000..5253d0f532 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/bolt-closed.png new file mode 100644 index 0000000000..ef9eee8374 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/bolt-open.png new file mode 100644 index 0000000000..6fc61d3797 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/icon.png b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/icon.png new file mode 100644 index 0000000000..3473286801 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/inhand-left.png new file mode 100644 index 0000000000..27c5fd9f9c Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/inhand-right.png new file mode 100644 index 0000000000..969088f872 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/mag-0.png b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/mag-0.png new file mode 100644 index 0000000000..af6512ec8c Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/meta.json new file mode 100644 index 0000000000..ead4cd15ac --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/zoric.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/base.png b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/base.png new file mode 100644 index 0000000000..1d3384ca75 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/bolt-closed.png new file mode 100644 index 0000000000..d53d968bc4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/bolt-open.png new file mode 100644 index 0000000000..563a8490c9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/icon.png b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/icon.png new file mode 100644 index 0000000000..a55c684db3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/inhand-left.png new file mode 100644 index 0000000000..3abfce4675 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/inhand-right.png new file mode 100644 index 0000000000..e5492fe593 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/mag-0.png b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/mag-0.png new file mode 100644 index 0000000000..05231bd863 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/meta.json b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/meta.json new file mode 100644 index 0000000000..6135f1fcce --- /dev/null +++ b/Resources/Textures/Objects/Guns/Shotguns/bojevic.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "mag-0", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/base.png b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/base.png new file mode 100644 index 0000000000..4e39b92fc6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/icon.png b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/icon.png new file mode 100644 index 0000000000..d6fbb59781 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/inhand-left.png new file mode 100644 index 0000000000..1c6e46490b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/inhand-right.png new file mode 100644 index 0000000000..ec649e7073 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..700fb47221 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..94f83eef82 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..08365c8356 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..30490db2e7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/meta.json b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/meta.json new file mode 100644 index 0000000000..c5af0f5ee2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Shotguns/bull.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "mag-unshaded-1", + "directions": 1 + }, + { + "name": "mag-unshaded-2", + "directions": 1 + }, + { + "name": "mag-unshaded-3", + "directions": 1 + }, + { + "name": "mag-unshaded-4", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/base.png b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/base.png new file mode 100644 index 0000000000..92d04499b2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/bolt-closed.png new file mode 100644 index 0000000000..9c13102fcb Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/bolt-open.png new file mode 100644 index 0000000000..46c7c5f9cb Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/icon.png b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/icon.png new file mode 100644 index 0000000000..d76287e02e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/inhand-left.png new file mode 100644 index 0000000000..83453c8112 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/inhand-right.png new file mode 100644 index 0000000000..11248f1b68 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/meta.json new file mode 100644 index 0000000000..4a63c4c35c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Shotguns/db_shotgun.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/icon.png b/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/icon.png new file mode 100644 index 0000000000..3b359fd89f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/inhand-left.png new file mode 100644 index 0000000000..b20356f87d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/inhand-right.png new file mode 100644 index 0000000000..adf01d5a99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/meta.json b/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/meta.json new file mode 100644 index 0000000000..225bbe87bb --- /dev/null +++ b/Resources/Textures/Objects/Guns/Shotguns/gladstone.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/icon.png b/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/icon.png new file mode 100644 index 0000000000..bede110e2b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/inhand-left.png new file mode 100644 index 0000000000..74994ddff5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/inhand-right.png new file mode 100644 index 0000000000..c5864a2168 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/meta.json new file mode 100644 index 0000000000..1629eb9816 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Shotguns/pump.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/icon.png b/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/icon.png new file mode 100644 index 0000000000..94af48c6c4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/inhand-left.png new file mode 100644 index 0000000000..d8f62a9dae Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/inhand-right.png new file mode 100644 index 0000000000..e6afc64a2f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/meta.json b/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/meta.json new file mode 100644 index 0000000000..3158b7d0a7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Shotguns/regulator.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/base.png b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/base.png new file mode 100644 index 0000000000..8a451be3d5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/bolt-closed.png new file mode 100644 index 0000000000..07000a4ca4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/bolt-open.png new file mode 100644 index 0000000000..63a1f7e77e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/icon.png b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/icon.png new file mode 100644 index 0000000000..3681d06642 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/inhand-left.png new file mode 100644 index 0000000000..f588ac6014 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/inhand-right.png new file mode 100644 index 0000000000..b40953313c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/meta.json b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/meta.json new file mode 100644 index 0000000000..d84344ec44 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Shotguns/sawn.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/base.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/base.png new file mode 100644 index 0000000000..f40dd350a3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/bolt-closed.png new file mode 100644 index 0000000000..c4efe9ce9d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/bolt-open.png new file mode 100644 index 0000000000..81cca7aac2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/icon.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/icon.png new file mode 100644 index 0000000000..b632e03602 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/inhand-left.png new file mode 100644 index 0000000000..187c36a79b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/inhand-right.png new file mode 100644 index 0000000000..e4da10b24e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/meta.json b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/meta.json new file mode 100644 index 0000000000..a3ccfb634d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Snipers/bolt_gun.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/base.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/base.png new file mode 100644 index 0000000000..0faddef927 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/bolt-closed.png new file mode 100644 index 0000000000..c4efe9ce9d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/bolt-open.png new file mode 100644 index 0000000000..00ceb0ff47 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/icon.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/icon.png new file mode 100644 index 0000000000..2fe3906ba3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/inhand-left.png new file mode 100644 index 0000000000..7b5f1d484e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/inhand-right.png new file mode 100644 index 0000000000..a7f5f5cca7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/meta.json new file mode 100644 index 0000000000..a3ccfb634d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Snipers/bolt_gun_wood.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/base.png b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/base.png new file mode 100644 index 0000000000..83594e068f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/base.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/bolt-closed.png b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/bolt-closed.png new file mode 100644 index 0000000000..5bc658f755 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/bolt-closed.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/bolt-open.png b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/bolt-open.png new file mode 100644 index 0000000000..5943b1f751 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/icon.png b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/icon.png new file mode 100644 index 0000000000..6a17ed46a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/inhand-left.png new file mode 100644 index 0000000000..fac9dcfc5b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/inhand-right.png new file mode 100644 index 0000000000..850640d3d0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/meta.json b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/meta.json new file mode 100644 index 0000000000..2d598be59c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Snipers/heavy_sniper.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "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", + "directions": 1 + }, + { + "name": "base", + "directions": 1 + }, + { + "name": "bolt-closed", + "directions": 1 + }, + { + "name": "bolt-open", + "directions": 1 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Projectiles/buckshot.png b/Resources/Textures/Objects/Projectiles/buckshot.png deleted file mode 100644 index 950a759155..0000000000 Binary files a/Resources/Textures/Objects/Projectiles/buckshot.png and /dev/null differ diff --git a/Resources/Textures/Objects/Projectiles/bullet.png b/Resources/Textures/Objects/Projectiles/bullet.png deleted file mode 100644 index 2c9ac21bd3..0000000000 Binary files a/Resources/Textures/Objects/Projectiles/bullet.png and /dev/null differ diff --git a/Resources/Textures/Objects/Projectiles/heavylaser.png b/Resources/Textures/Objects/Projectiles/heavylaser.png deleted file mode 100644 index b19aad95e4..0000000000 Binary files a/Resources/Textures/Objects/Projectiles/heavylaser.png and /dev/null differ diff --git a/Resources/Textures/Objects/Projectiles/laser.png b/Resources/Textures/Objects/Projectiles/laser.png deleted file mode 100644 index 00432972d1..0000000000 Binary files a/Resources/Textures/Objects/Projectiles/laser.png and /dev/null differ diff --git a/Resources/Textures/Objects/markers.rsi/AI.png b/Resources/Textures/Objects/markers.rsi/AI.png index 1e6533c229..aa331c468b 100644 Binary files a/Resources/Textures/Objects/markers.rsi/AI.png and b/Resources/Textures/Objects/markers.rsi/AI.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Assistant.png b/Resources/Textures/Objects/markers.rsi/Assistant.png index 7588e08c7b..139cba34f5 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Assistant.png and b/Resources/Textures/Objects/markers.rsi/Assistant.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Atmospheric Technician.png b/Resources/Textures/Objects/markers.rsi/Atmospheric Technician.png index 25e454b11d..b25133c96d 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Atmospheric Technician.png and b/Resources/Textures/Objects/markers.rsi/Atmospheric Technician.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Bartender.png b/Resources/Textures/Objects/markers.rsi/Bartender.png index acf2e044e0..d0f4baaf2b 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Bartender.png and b/Resources/Textures/Objects/markers.rsi/Bartender.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Botanist.png b/Resources/Textures/Objects/markers.rsi/Botanist.png index 51eb2b02b3..8e81377214 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Botanist.png and b/Resources/Textures/Objects/markers.rsi/Botanist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Captain.png b/Resources/Textures/Objects/markers.rsi/Captain.png index 6d832c820e..f32f53e462 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Captain.png and b/Resources/Textures/Objects/markers.rsi/Captain.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Cargo Technician.png b/Resources/Textures/Objects/markers.rsi/Cargo Technician.png index 89cdc3bded..e162a24154 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Cargo Technician.png and b/Resources/Textures/Objects/markers.rsi/Cargo Technician.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Chaplain.png b/Resources/Textures/Objects/markers.rsi/Chaplain.png index 84223f7402..c293074cd4 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Chaplain.png and b/Resources/Textures/Objects/markers.rsi/Chaplain.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Chemist.png b/Resources/Textures/Objects/markers.rsi/Chemist.png index 2e10a6cac9..d983b91c58 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Chemist.png and b/Resources/Textures/Objects/markers.rsi/Chemist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Chief Engineer.png b/Resources/Textures/Objects/markers.rsi/Chief Engineer.png index aad16c9ba3..ec40156f1f 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Chief Engineer.png and b/Resources/Textures/Objects/markers.rsi/Chief Engineer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Chief Medical Officer.png b/Resources/Textures/Objects/markers.rsi/Chief Medical Officer.png index 8dc1bcf25e..4411c7fa3c 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Chief Medical Officer.png and b/Resources/Textures/Objects/markers.rsi/Chief Medical Officer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Clown.png b/Resources/Textures/Objects/markers.rsi/Clown.png index 6282d74de2..994a291f68 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Clown.png and b/Resources/Textures/Objects/markers.rsi/Clown.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Cook.png b/Resources/Textures/Objects/markers.rsi/Cook.png index cc778e79ab..f8eae67a88 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Cook.png and b/Resources/Textures/Objects/markers.rsi/Cook.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Curator.png b/Resources/Textures/Objects/markers.rsi/Curator.png index cd7201ce4d..d9310a0bf3 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Curator.png and b/Resources/Textures/Objects/markers.rsi/Curator.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Cyborg.png b/Resources/Textures/Objects/markers.rsi/Cyborg.png index f406e6b663..8811385665 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Cyborg.png and b/Resources/Textures/Objects/markers.rsi/Cyborg.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Detective.png b/Resources/Textures/Objects/markers.rsi/Detective.png index b91db06e1a..73d944a0a7 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Detective.png and b/Resources/Textures/Objects/markers.rsi/Detective.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Geneticist.png b/Resources/Textures/Objects/markers.rsi/Geneticist.png index aaa3f2c5c6..9f6e4e9ffe 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Geneticist.png and b/Resources/Textures/Objects/markers.rsi/Geneticist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Head of Personnel.png b/Resources/Textures/Objects/markers.rsi/Head of Personnel.png index 148e5ebbe5..5c9b2f05c1 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Head of Personnel.png and b/Resources/Textures/Objects/markers.rsi/Head of Personnel.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Head of Security.png b/Resources/Textures/Objects/markers.rsi/Head of Security.png index 48fe1dec81..e13caa290a 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Head of Security.png and b/Resources/Textures/Objects/markers.rsi/Head of Security.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Janitor.png b/Resources/Textures/Objects/markers.rsi/Janitor.png index 6872e9340d..7be84691d1 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Janitor.png and b/Resources/Textures/Objects/markers.rsi/Janitor.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Lawyer.png b/Resources/Textures/Objects/markers.rsi/Lawyer.png index b3c3dec78c..403b6dd982 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Lawyer.png and b/Resources/Textures/Objects/markers.rsi/Lawyer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Medical Doctor.png b/Resources/Textures/Objects/markers.rsi/Medical Doctor.png index f8fea38838..3b2fad9f3f 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Medical Doctor.png and b/Resources/Textures/Objects/markers.rsi/Medical Doctor.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Mime.png b/Resources/Textures/Objects/markers.rsi/Mime.png index 24419d8855..a051ff5117 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Mime.png and b/Resources/Textures/Objects/markers.rsi/Mime.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Paramedic.png b/Resources/Textures/Objects/markers.rsi/Paramedic.png index 786f1b5b93..6e228574e6 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Paramedic.png and b/Resources/Textures/Objects/markers.rsi/Paramedic.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Prisoner.png b/Resources/Textures/Objects/markers.rsi/Prisoner.png index 352fae0668..35383af8cb 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Prisoner.png and b/Resources/Textures/Objects/markers.rsi/Prisoner.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Psychologist.png b/Resources/Textures/Objects/markers.rsi/Psychologist.png index 89d4496621..3c6339791b 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Psychologist.png and b/Resources/Textures/Objects/markers.rsi/Psychologist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Quartermaster.png b/Resources/Textures/Objects/markers.rsi/Quartermaster.png index 538d063eac..ac2aafa5cd 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Quartermaster.png and b/Resources/Textures/Objects/markers.rsi/Quartermaster.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Research Director.png b/Resources/Textures/Objects/markers.rsi/Research Director.png index ab8775e3cc..bfcd188b59 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Research Director.png and b/Resources/Textures/Objects/markers.rsi/Research Director.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Roboticist.png b/Resources/Textures/Objects/markers.rsi/Roboticist.png index bb9f014e9d..05384b4b76 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Roboticist.png and b/Resources/Textures/Objects/markers.rsi/Roboticist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Scientist.png b/Resources/Textures/Objects/markers.rsi/Scientist.png index 8cd403488b..ac4849ba69 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Scientist.png and b/Resources/Textures/Objects/markers.rsi/Scientist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Security Officer.png b/Resources/Textures/Objects/markers.rsi/Security Officer.png index ad1e418991..8d5dcdc9e3 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Security Officer.png and b/Resources/Textures/Objects/markers.rsi/Security Officer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Shaft Miner.png b/Resources/Textures/Objects/markers.rsi/Shaft Miner.png index 7c647980af..3d9c41b498 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Shaft Miner.png and b/Resources/Textures/Objects/markers.rsi/Shaft Miner.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Station Engineer.png b/Resources/Textures/Objects/markers.rsi/Station Engineer.png index ee306c811d..d561f3de46 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Station Engineer.png and b/Resources/Textures/Objects/markers.rsi/Station Engineer.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Virologist.png b/Resources/Textures/Objects/markers.rsi/Virologist.png index e0e611cbf1..002550aaec 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Virologist.png and b/Resources/Textures/Objects/markers.rsi/Virologist.png differ diff --git a/Resources/Textures/Objects/markers.rsi/Warden.png b/Resources/Textures/Objects/markers.rsi/Warden.png index 6eeace59ab..6d577a752e 100644 Binary files a/Resources/Textures/Objects/markers.rsi/Warden.png and b/Resources/Textures/Objects/markers.rsi/Warden.png differ diff --git a/Resources/Textures/Objects/markers.rsi/cross_green.png b/Resources/Textures/Objects/markers.rsi/cross_green.png index b5366b2bdf..0becfdb0c5 100644 Binary files a/Resources/Textures/Objects/markers.rsi/cross_green.png and b/Resources/Textures/Objects/markers.rsi/cross_green.png differ diff --git a/Resources/Textures/Objects/markers.rsi/cross_pink.png b/Resources/Textures/Objects/markers.rsi/cross_pink.png index e9fa9fc5d3..d5476f99e6 100644 Binary files a/Resources/Textures/Objects/markers.rsi/cross_pink.png and b/Resources/Textures/Objects/markers.rsi/cross_pink.png differ diff --git a/Resources/Textures/Objects/markers.rsi/cross_red.png b/Resources/Textures/Objects/markers.rsi/cross_red.png index 4ac7f06b20..063f341d36 100644 Binary files a/Resources/Textures/Objects/markers.rsi/cross_red.png and b/Resources/Textures/Objects/markers.rsi/cross_red.png differ diff --git a/Resources/Textures/Objects/markers.rsi/meta.json b/Resources/Textures/Objects/markers.rsi/meta.json index 02df455363..7eb1bca74a 100644 --- a/Resources/Textures/Objects/markers.rsi/meta.json +++ b/Resources/Textures/Objects/markers.rsi/meta.json @@ -1 +1,461 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", "states": [{"name": "cross_blue", "directions": 1, "delays": [[1.0]]}, {"name": "cross_green", "directions": 1, "delays": [[1.0]]}, {"name": "cross_red", "directions": 1, "delays": [[1.0]]}, {"name": "AI", "directions": 1, "delays": [[1.0]]}, {"name": "Assistant", "directions": 1, "delays": [[1.0]]}, {"name": "Atmospheric Technician", "directions": 1, "delays": [[1.0]]}, {"name": "Bartender", "directions": 1, "delays": [[1.0]]}, {"name": "Botanist", "directions": 1, "delays": [[1.0]]}, {"name": "Captain", "directions": 1, "delays": [[1.0]]}, {"name": "Cargo Technician", "directions": 1, "delays": [[1.0]]}, {"name": "Chaplain", "directions": 1, "delays": [[1.0]]}, {"name": "Chemist", "directions": 1, "delays": [[1.0]]}, {"name": "Chief Engineer", "directions": 1, "delays": [[1.0]]}, {"name": "Chief Medical Officer", "directions": 1, "delays": [[1.0]]}, {"name": "Clown", "directions": 1, "delays": [[1.0]]}, {"name": "Cook", "directions": 1, "delays": [[1.0]]}, {"name": "Curator", "directions": 1, "delays": [[1.0]]}, {"name": "Cyborg", "directions": 1, "delays": [[1.0]]}, {"name": "Detective", "directions": 1, "delays": [[1.0]]}, {"name": "Geneticist", "directions": 1, "delays": [[1.0]]}, {"name": "Head of Personnel", "directions": 1, "delays": [[1.0]]}, {"name": "Head of Security", "directions": 1, "delays": [[1.0]]}, {"name": "Janitor", "directions": 1, "delays": [[1.0]]}, {"name": "Lawyer", "directions": 1, "delays": [[1.0]]}, {"name": "Medical Doctor", "directions": 1, "delays": [[1.0]]}, {"name": "Mime", "directions": 1, "delays": [[1.0]]}, {"name": "Paramedic", "directions": 1, "delays": [[1.0]]}, {"name": "Prisoner", "directions": 1, "delays": [[1.0]]}, {"name": "Psychologist", "directions": 1, "delays": [[1.0]]}, {"name": "Quartermaster", "directions": 1, "delays": [[1.0]]}, {"name": "Research Director", "directions": 1, "delays": [[1.0]]}, {"name": "Roboticist", "directions": 1, "delays": [[1.0]]}, {"name": "Scientist", "directions": 1, "delays": [[1.0]]}, {"name": "Security Officer", "directions": 1, "delays": [[1.0]]}, {"name": "Shaft Miner", "directions": 1, "delays": [[1.0]]}, {"name": "Station Engineer", "directions": 1, "delays": [[1.0]]}, {"name": "Virologist", "directions": 1, "delays": [[1.0]]}, {"name": "Warden", "directions": 1, "delays": [[1.0]]}, {"name": "cross_pink", "directions": 1, "delays": [[1.0]]}, {"name": "observer_start", "directions": 1, "delays": [[1.0]]}, {"name": "spawner_melee", "directions": 1, "delays": [[1.0]]}, {"name": "spawner_rifle", "directions": 1, "delays": [[1.0]]}, {"name": "spawner_pistol", "directions": 1, "delays": [[1.0]]}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi", + "states": [ + { + "name": "AI", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Assistant", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Atmospheric Technician", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Bartender", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Botanist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Captain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Cargo Technician", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Chaplain", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Chemist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Chief Engineer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Chief Medical Officer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Clown", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Cook", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Curator", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Cyborg", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Detective", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Geneticist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Head of Personnel", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Head of Security", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Janitor", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Lawyer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Medical Doctor", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Mime", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Paramedic", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Prisoner", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Psychologist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Quartermaster", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Research Director", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Roboticist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Scientist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Security Officer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Shaft Miner", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Station Engineer", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Virologist", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "Warden", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "cross_blue", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "cross_green", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "cross_pink", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "cross_red", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "observer_start", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_grenade", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_hitscan", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_launcher", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_melee", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_pistol", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_revolver", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_rifle", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_shotgun", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_smg", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "spawner_sniper", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/markers.rsi/observer_start.png b/Resources/Textures/Objects/markers.rsi/observer_start.png index 8f965c9751..309baacb03 100644 Binary files a/Resources/Textures/Objects/markers.rsi/observer_start.png and b/Resources/Textures/Objects/markers.rsi/observer_start.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_grenade.png b/Resources/Textures/Objects/markers.rsi/spawner_grenade.png new file mode 100644 index 0000000000..bac248ef76 Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_grenade.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_hitscan.png b/Resources/Textures/Objects/markers.rsi/spawner_hitscan.png new file mode 100644 index 0000000000..5d6dbe39ec Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_hitscan.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_launcher.png b/Resources/Textures/Objects/markers.rsi/spawner_launcher.png new file mode 100644 index 0000000000..63f0e1b0cc Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_launcher.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_melee.png b/Resources/Textures/Objects/markers.rsi/spawner_melee.png index bc3fd59227..7a1ea775d6 100644 Binary files a/Resources/Textures/Objects/markers.rsi/spawner_melee.png and b/Resources/Textures/Objects/markers.rsi/spawner_melee.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_pistol.png b/Resources/Textures/Objects/markers.rsi/spawner_pistol.png index 6f9b871e53..745347acba 100644 Binary files a/Resources/Textures/Objects/markers.rsi/spawner_pistol.png and b/Resources/Textures/Objects/markers.rsi/spawner_pistol.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_revolver.png b/Resources/Textures/Objects/markers.rsi/spawner_revolver.png new file mode 100644 index 0000000000..0e8add9464 Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_revolver.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_rifle.png b/Resources/Textures/Objects/markers.rsi/spawner_rifle.png index 0b1c339595..2dbb558c05 100644 Binary files a/Resources/Textures/Objects/markers.rsi/spawner_rifle.png and b/Resources/Textures/Objects/markers.rsi/spawner_rifle.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_shotgun.png b/Resources/Textures/Objects/markers.rsi/spawner_shotgun.png new file mode 100644 index 0000000000..86092fefa5 Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_shotgun.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_smg.png b/Resources/Textures/Objects/markers.rsi/spawner_smg.png new file mode 100644 index 0000000000..b0fb68c028 Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_smg.png differ diff --git a/Resources/Textures/Objects/markers.rsi/spawner_sniper.png b/Resources/Textures/Objects/markers.rsi/spawner_sniper.png new file mode 100644 index 0000000000..b1eef469be Binary files /dev/null and b/Resources/Textures/Objects/markers.rsi/spawner_sniper.png differ diff --git a/Resources/Textures/UserInterface/Inventory/neck.png b/Resources/Textures/UserInterface/Inventory/neck.png new file mode 100644 index 0000000000..d744499516 Binary files /dev/null and b/Resources/Textures/UserInterface/Inventory/neck.png differ diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 85aae27e3f..29388101ed 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -34,7 +34,7 @@ binds: - function: MoveDown type: State key: S -- function: Run +- function: Walk type: State key: Shift - function: ShowEscapeMenu diff --git a/SpaceStation14.sln.DotSettings b/SpaceStation14.sln.DotSettings index 5e9ee1ab64..39b7cb2137 100644 --- a/SpaceStation14.sln.DotSettings +++ b/SpaceStation14.sln.DotSettings @@ -57,9 +57,9 @@ True True True + True True True True True - True - True + \ No newline at end of file diff --git a/Tools/package_release_build.py b/Tools/package_release_build.py index 8400021f61..fae399325a 100755 --- a/Tools/package_release_build.py +++ b/Tools/package_release_build.py @@ -75,12 +75,13 @@ WINDOWS_NATIVES = { LINUX_NATIVES = { "libglfw.so.3", - "libswnfd.so" + "libswnfd.so", } MAC_NATIVES = { "libglfw.3.dylib", - "libswnfd.dylib" + "libswnfd.dylib", + "libfreetype.6.dylib" } SERVER_EXTRA_CONTENT_ASSEMBLIES = [