diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs index d0d23be050..782af8e469 100644 --- a/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponVisualizer2D.cs @@ -1,7 +1,9 @@ +using System; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.Utility; using Robust.Client.GameObjects; using Robust.Client.Interfaces.GameObjects.Components; +using Robust.Shared.Log; using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; @@ -37,8 +39,8 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged return; } - var step = ContentHelpers.RoundToLevels(current, capacity, _steps); - + // 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 diff --git a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs index d2a36ae105..3d6a60ce32 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs @@ -5,6 +5,10 @@ using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects.Components; +using Content.Server.GameObjects.Components.Mobs; +using Content.Shared.GameObjects; +using Robust.Shared.Log; +using Robust.Shared.Serialization; using Robust.Shared.Interfaces.Physics; namespace Content.Server.GameObjects.Components.Projectiles @@ -18,7 +22,23 @@ namespace Content.Server.GameObjects.Components.Projectiles private EntityUid Shooter = EntityUid.Invalid; - public Dictionary damages = new Dictionary(); + private Dictionary _damages; + [ViewVariables] + public Dictionary Damages => _damages; + private float _velocity; + public float Velocity + { + get => _velocity; + set => _velocity = value; + } + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + // If not specified 0 damage + serializer.DataField(ref _damages, "damages", new Dictionary()); + serializer.DataField(ref _velocity, "velocity", 20f); + } public float TimeLeft { get; set; } = 10; @@ -53,7 +73,10 @@ namespace Content.Server.GameObjects.Components.Projectiles { if (entity.TryGetComponent(out DamageableComponent damage)) { - damage.TakeDamage(DamageType.Brute, 10); + foreach (var damageType in _damages) + { + damage.TakeDamage(damageType.Key, damageType.Value); + } } if (entity.TryGetComponent(out CameraRecoilComponent recoilComponent) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs index 8595fbf30b..6478621d38 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs @@ -136,6 +136,33 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile public enum BallisticMagazineType { Unspecified = 0, - A12mm, + // .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, } } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs index 4d6053a42b..9453e57b4f 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineWeaponComponent.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Linq; using Content.Server.GameObjects.Components.Sound; using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects; @@ -12,6 +14,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; +using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Random; using Robust.Shared.Serialization; @@ -30,10 +33,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile [ViewVariables] private ContainerSlot _magazineSlot; - private BallisticMagazineType _magazineType; + private List _magazineTypes; [ViewVariables] - public BallisticMagazineType MagazineType => _magazineType; + public List MagazineTypes => _magazineTypes; [ViewVariables] private IEntity Magazine => _magazineSlot.ContainedEntity; @@ -65,7 +68,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { base.ExposeData(serializer); - serializer.DataField(ref _magazineType, "magazine", BallisticMagazineType.Unspecified); + 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); @@ -102,7 +106,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile throw new ArgumentException("Not a magazine", nameof(magazine)); } - if (component.MagazineType != MagazineType) + if (!MagazineTypes.Contains(component.MagazineType)) { throw new ArgumentException("Wrong magazine type", nameof(magazine)); } @@ -170,7 +174,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile var entity = RemoveFromChamber(chamber); entity.Transform.GridPosition = Owner.Transform.GridPosition; entity.Transform.LocalRotation = _bulletDropRandom.Pick(_randomBulletDirs).ToAngle(); - var effect = $"/Audio/items/weapons/casingfall{_bulletDropRandom.Next(1, 4)}.ogg"; + var effect = $"/Audio/Guns/Casings/casingfall{_bulletDropRandom.Next(1, 4)}.ogg"; Owner.GetComponent().Play(effect, AudioParams.Default.WithVolume(-3)); if (Magazine != null) @@ -223,7 +227,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile return false; } - if (component.MagazineType != MagazineType || component.Caliber != Caliber) + if (!MagazineTypes.Contains(component.MagazineType) || component.Caliber != Caliber) { Owner.PopupMessage(eventArgs.User, "Magazine doesn't fit."); return false; diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs index 7481342ead..3febf9da4b 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs @@ -21,9 +21,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { public abstract class ProjectileWeaponComponent : Component { - private float _velocity = 20f; private float _spreadStdDev = 3; private bool _spread = true; + private string _soundGunshot; #pragma warning disable 649 [Dependency] private IRobustRandom _spreadRandom; @@ -57,6 +57,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile serializer.DataField(ref _spread, "spread", true); serializer.DataField(ref _spreadStdDev, "spreadstddev", 3); + serializer.DataField(ref _soundGunshot, "sound_gunshot", "/Audio/Guns/Gunshots/smg.ogg"); } private void Fire(IEntity user, GridCoordinates clickLocation) @@ -85,15 +86,16 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile //Give it the velocity we fire from this weapon, and make sure it doesn't shoot our character projectile.GetComponent().IgnoreEntity(user); + var velocity = projectile.GetComponent().Velocity; //Give it the velocity this weapon gives to things it fires from itself - projectile.GetComponent().LinearVelocity = angle.ToVec() * _velocity; + projectile.GetComponent().LinearVelocity = angle.ToVec() * velocity; //Rotate the bullets sprite to the correct direction, from north facing I guess projectile.Transform.LocalRotation = angle.Theta; // Sound! - Owner.GetComponent().Play("/Audio/gunshot_c20.ogg"); + Owner.GetComponent().Play(_soundGunshot); } /// @@ -105,6 +107,29 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile public enum BallisticCaliber { Unspecified = 0, - A12mm, + // .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, } } diff --git a/Content.Shared/Utility/ContentHelpers.cs b/Content.Shared/Utility/ContentHelpers.cs index 7b1682e0ee..2eab08cff4 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) + if (toOne <= threshold || levels == 2) { return (int)Math.Ceiling(preround); } diff --git a/Resources/Audio/items/weapons/casingfall1.ogg b/Resources/Audio/guns/Casings/casingfall1.ogg similarity index 100% rename from Resources/Audio/items/weapons/casingfall1.ogg rename to Resources/Audio/guns/Casings/casingfall1.ogg diff --git a/Resources/Audio/items/weapons/casingfall2.ogg b/Resources/Audio/guns/Casings/casingfall2.ogg similarity index 100% rename from Resources/Audio/items/weapons/casingfall2.ogg rename to Resources/Audio/guns/Casings/casingfall2.ogg diff --git a/Resources/Audio/items/weapons/casingfall3.ogg b/Resources/Audio/guns/Casings/casingfall3.ogg similarity index 100% rename from Resources/Audio/items/weapons/casingfall3.ogg rename to Resources/Audio/guns/Casings/casingfall3.ogg diff --git a/Resources/Audio/guns/Cock/batrifle_cock.ogg b/Resources/Audio/guns/Cock/batrifle_cock.ogg new file mode 100644 index 0000000000..ac02ed93c1 Binary files /dev/null and b/Resources/Audio/guns/Cock/batrifle_cock.ogg differ diff --git a/Resources/Audio/guns/Cock/lmg_cock.ogg b/Resources/Audio/guns/Cock/lmg_cock.ogg new file mode 100644 index 0000000000..a3c7e31110 Binary files /dev/null and b/Resources/Audio/guns/Cock/lmg_cock.ogg differ diff --git a/Resources/Audio/guns/Cock/ltrifle_cock.ogg b/Resources/Audio/guns/Cock/ltrifle_cock.ogg new file mode 100644 index 0000000000..feaef28965 Binary files /dev/null and b/Resources/Audio/guns/Cock/ltrifle_cock.ogg differ diff --git a/Resources/Audio/guns/Cock/sfrifle_cock.ogg b/Resources/Audio/guns/Cock/sfrifle_cock.ogg new file mode 100644 index 0000000000..d65cafce8b Binary files /dev/null and b/Resources/Audio/guns/Cock/sfrifle_cock.ogg differ diff --git a/Resources/Audio/items/weapons/gun_empty.ogg b/Resources/Audio/guns/Empty/empty.ogg similarity index 100% rename from Resources/Audio/items/weapons/gun_empty.ogg rename to Resources/Audio/guns/Empty/empty.ogg diff --git a/Resources/Audio/guns/Empty/lmg_empty.ogg b/Resources/Audio/guns/Empty/lmg_empty.ogg new file mode 100644 index 0000000000..12ef9e5fce Binary files /dev/null and b/Resources/Audio/guns/Empty/lmg_empty.ogg differ diff --git a/Resources/Audio/guns/EmptyAlarm/lmg_empty_alarm.ogg b/Resources/Audio/guns/EmptyAlarm/lmg_empty_alarm.ogg new file mode 100644 index 0000000000..3a20bc692b Binary files /dev/null and b/Resources/Audio/guns/EmptyAlarm/lmg_empty_alarm.ogg differ diff --git a/Resources/Audio/items/weapons/smg_empty_alarm.ogg b/Resources/Audio/guns/EmptyAlarm/smg_empty_alarm.ogg similarity index 100% rename from Resources/Audio/items/weapons/smg_empty_alarm.ogg rename to Resources/Audio/guns/EmptyAlarm/smg_empty_alarm.ogg diff --git a/Resources/Audio/guns/MagIn/batrifle_magin.ogg b/Resources/Audio/guns/MagIn/batrifle_magin.ogg new file mode 100644 index 0000000000..6e557b892a Binary files /dev/null and b/Resources/Audio/guns/MagIn/batrifle_magin.ogg differ diff --git a/Resources/Audio/guns/MagIn/hpistol_magin.ogg b/Resources/Audio/guns/MagIn/hpistol_magin.ogg new file mode 100644 index 0000000000..c74160fdb5 Binary files /dev/null and b/Resources/Audio/guns/MagIn/hpistol_magin.ogg differ diff --git a/Resources/Audio/guns/MagIn/lmg_magin.ogg b/Resources/Audio/guns/MagIn/lmg_magin.ogg new file mode 100644 index 0000000000..12a11584d5 Binary files /dev/null and b/Resources/Audio/guns/MagIn/lmg_magin.ogg differ diff --git a/Resources/Audio/guns/MagIn/ltrifle_magin.ogg b/Resources/Audio/guns/MagIn/ltrifle_magin.ogg new file mode 100644 index 0000000000..2afb05fb81 Binary files /dev/null and b/Resources/Audio/guns/MagIn/ltrifle_magin.ogg differ diff --git a/Resources/Audio/guns/MagIn/m41_reload.ogg b/Resources/Audio/guns/MagIn/m41_reload.ogg new file mode 100644 index 0000000000..4d964e8e13 Binary files /dev/null and b/Resources/Audio/guns/MagIn/m41_reload.ogg differ diff --git a/Resources/Audio/guns/MagIn/pistol_magin.ogg b/Resources/Audio/guns/MagIn/pistol_magin.ogg new file mode 100644 index 0000000000..c442f8b162 Binary files /dev/null and b/Resources/Audio/guns/MagIn/pistol_magin.ogg differ diff --git a/Resources/Audio/guns/MagIn/revolver_magin.ogg b/Resources/Audio/guns/MagIn/revolver_magin.ogg new file mode 100644 index 0000000000..838974489a Binary files /dev/null and b/Resources/Audio/guns/MagIn/revolver_magin.ogg differ diff --git a/Resources/Audio/guns/MagIn/rifle_load.ogg b/Resources/Audio/guns/MagIn/rifle_load.ogg new file mode 100644 index 0000000000..8309e26b6d Binary files /dev/null and b/Resources/Audio/guns/MagIn/rifle_load.ogg differ diff --git a/Resources/Audio/guns/MagIn/sfrifle_magin.ogg b/Resources/Audio/guns/MagIn/sfrifle_magin.ogg new file mode 100644 index 0000000000..ebb1f6881b Binary files /dev/null and b/Resources/Audio/guns/MagIn/sfrifle_magin.ogg differ diff --git a/Resources/Audio/items/weapons/smg_magin.ogg b/Resources/Audio/guns/MagIn/smg_magin.ogg similarity index 100% rename from Resources/Audio/items/weapons/smg_magin.ogg rename to Resources/Audio/guns/MagIn/smg_magin.ogg diff --git a/Resources/Audio/guns/MagOut/batrifle_magout.ogg b/Resources/Audio/guns/MagOut/batrifle_magout.ogg new file mode 100644 index 0000000000..591599f523 Binary files /dev/null and b/Resources/Audio/guns/MagOut/batrifle_magout.ogg differ diff --git a/Resources/Audio/guns/MagOut/hpistol_magout.ogg b/Resources/Audio/guns/MagOut/hpistol_magout.ogg new file mode 100644 index 0000000000..ddad68ed7d Binary files /dev/null and b/Resources/Audio/guns/MagOut/hpistol_magout.ogg differ diff --git a/Resources/Audio/guns/MagOut/lmg_magout.ogg b/Resources/Audio/guns/MagOut/lmg_magout.ogg new file mode 100644 index 0000000000..d5a70b20b2 Binary files /dev/null and b/Resources/Audio/guns/MagOut/lmg_magout.ogg differ diff --git a/Resources/Audio/guns/MagOut/ltrifle_magout.ogg b/Resources/Audio/guns/MagOut/ltrifle_magout.ogg new file mode 100644 index 0000000000..3ddf2c83bf Binary files /dev/null and b/Resources/Audio/guns/MagOut/ltrifle_magout.ogg differ diff --git a/Resources/Audio/guns/MagOut/pistol_magout.ogg b/Resources/Audio/guns/MagOut/pistol_magout.ogg new file mode 100644 index 0000000000..334d1a12f2 Binary files /dev/null and b/Resources/Audio/guns/MagOut/pistol_magout.ogg differ diff --git a/Resources/Audio/guns/MagOut/revolver_magout.ogg b/Resources/Audio/guns/MagOut/revolver_magout.ogg new file mode 100644 index 0000000000..75412e787f Binary files /dev/null and b/Resources/Audio/guns/MagOut/revolver_magout.ogg differ diff --git a/Resources/Audio/guns/MagOut/sfrifle_magout.ogg b/Resources/Audio/guns/MagOut/sfrifle_magout.ogg new file mode 100644 index 0000000000..919b5ee19d Binary files /dev/null and b/Resources/Audio/guns/MagOut/sfrifle_magout.ogg differ diff --git a/Resources/Audio/guns/MagOut/shotgun_insert.ogg b/Resources/Audio/guns/MagOut/shotgun_insert.ogg new file mode 100644 index 0000000000..cd5c5e31aa Binary files /dev/null and b/Resources/Audio/guns/MagOut/shotgun_insert.ogg differ diff --git a/Resources/Audio/items/weapons/smg_magout.ogg b/Resources/Audio/guns/MagOut/smg_magout.ogg similarity index 100% rename from Resources/Audio/items/weapons/smg_magout.ogg rename to Resources/Audio/guns/MagOut/smg_magout.ogg diff --git a/Resources/Audio/guns/gunshots/batrifle.ogg b/Resources/Audio/guns/gunshots/batrifle.ogg new file mode 100644 index 0000000000..48ba7cbb02 Binary files /dev/null and b/Resources/Audio/guns/gunshots/batrifle.ogg differ diff --git a/Resources/Audio/guns/gunshots/hpistol.ogg b/Resources/Audio/guns/gunshots/hpistol.ogg new file mode 100644 index 0000000000..b55c7ca5e0 Binary files /dev/null and b/Resources/Audio/guns/gunshots/hpistol.ogg differ diff --git a/Resources/Audio/laser.ogg b/Resources/Audio/guns/gunshots/laser.ogg similarity index 100% rename from Resources/Audio/laser.ogg rename to Resources/Audio/guns/gunshots/laser.ogg diff --git a/Resources/Audio/lasercannonfire.ogg b/Resources/Audio/guns/gunshots/laser_cannon.ogg similarity index 100% rename from Resources/Audio/lasercannonfire.ogg rename to Resources/Audio/guns/gunshots/laser_cannon.ogg diff --git a/Resources/Audio/guns/gunshots/laser_cannon2.ogg b/Resources/Audio/guns/gunshots/laser_cannon2.ogg new file mode 100644 index 0000000000..3ebbe65543 Binary files /dev/null and b/Resources/Audio/guns/gunshots/laser_cannon2.ogg differ diff --git a/Resources/Audio/guns/gunshots/lmg.ogg b/Resources/Audio/guns/gunshots/lmg.ogg new file mode 100644 index 0000000000..079aebac97 Binary files /dev/null and b/Resources/Audio/guns/gunshots/lmg.ogg differ diff --git a/Resources/Audio/guns/gunshots/ltrifle.ogg b/Resources/Audio/guns/gunshots/ltrifle.ogg new file mode 100644 index 0000000000..942e9f8308 Binary files /dev/null and b/Resources/Audio/guns/gunshots/ltrifle.ogg differ diff --git a/Resources/Audio/guns/gunshots/pistol.ogg b/Resources/Audio/guns/gunshots/pistol.ogg new file mode 100644 index 0000000000..38cf36e379 Binary files /dev/null and b/Resources/Audio/guns/gunshots/pistol.ogg differ diff --git a/Resources/Audio/guns/gunshots/revolver.ogg b/Resources/Audio/guns/gunshots/revolver.ogg new file mode 100644 index 0000000000..eec0785173 Binary files /dev/null and b/Resources/Audio/guns/gunshots/revolver.ogg differ diff --git a/Resources/Audio/guns/gunshots/rifle.ogg b/Resources/Audio/guns/gunshots/rifle.ogg new file mode 100644 index 0000000000..1353547656 Binary files /dev/null and b/Resources/Audio/guns/gunshots/rifle.ogg differ diff --git a/Resources/Audio/guns/gunshots/rifle2.ogg b/Resources/Audio/guns/gunshots/rifle2.ogg new file mode 100644 index 0000000000..289fb986f1 Binary files /dev/null and b/Resources/Audio/guns/gunshots/rifle2.ogg differ diff --git a/Resources/Audio/guns/gunshots/shotgun.ogg b/Resources/Audio/guns/gunshots/shotgun.ogg new file mode 100644 index 0000000000..2f499f08b0 Binary files /dev/null and b/Resources/Audio/guns/gunshots/shotgun.ogg differ diff --git a/Resources/Audio/guns/gunshots/silenced.ogg b/Resources/Audio/guns/gunshots/silenced.ogg new file mode 100644 index 0000000000..88075086b6 Binary files /dev/null and b/Resources/Audio/guns/gunshots/silenced.ogg differ diff --git a/Resources/Audio/gunshot_c20.ogg b/Resources/Audio/guns/gunshots/smg.ogg similarity index 100% rename from Resources/Audio/gunshot_c20.ogg rename to Resources/Audio/guns/gunshots/smg.ogg diff --git a/Resources/Audio/guns/gunshots/sniper.ogg b/Resources/Audio/guns/gunshots/sniper.ogg new file mode 100644 index 0000000000..4c280c224a Binary files /dev/null and b/Resources/Audio/guns/gunshots/sniper.ogg differ diff --git a/Resources/Audio/guns/sources.json b/Resources/Audio/guns/sources.json new file mode 100644 index 0000000000..5169aadb3a --- /dev/null +++ b/Resources/Audio/guns/sources.json @@ -0,0 +1,62 @@ +{ + "description": "Using a .json makes it easier to tell if sounds have duplicate sources", + "Casings": { + "casingfall1.ogg": "https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall1.ogg", + "casingfall2.ogg": "https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall2.ogg", + "casingfall3.ogg": "https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall3.ogg" + }, + "Cock": { + "batrifle_cock.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/batrifle_cock.ogg", + "lmg_cock.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/lmg_cock.ogg", + "ltrifle_cock.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/ltrifle_cock.ogg", + "sfrifle_cock.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/sfrifle_cock.ogg" + }, + "Empty": { + "empty.ogg": "https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/gun_empty.ogg", + "lmg_empty.ogg": "https://github.com/vgstation-coders/vgstation13/blob/217aa33a41e891e144ceec710fbe1877df747adb/sound/weapons/empty.ogg" + }, + "EmptyAlarm": { + "lmg_empty_alarm.ogg": "Soniss.com GDC 2019 Game Audio Bundle, gizmo_alarm_loop_001.wav", + "smg_empty_alarm.ogg": "https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/smg_empty_alarm.ogg" + }, + "Gunshots": { + "batrifle.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/batrifle_fire.ogg", + "hpistol.ogg": "", + "laser.ogg": "", + "laser_cannon.ogg": "", + "laser_cannon2.ogg": "soniss.com GDC 2019 Game Audio Bundle, PM_CNDP_23.wav", + "lmg.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/lmg_fire.ogg", + "ltrifle.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/ltrifle_fire.ogg", + "pistol.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/pistol_fire.ogg", + "revolver.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/revolver_fire.ogg", + "rifle.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/m41_shoot.ogg", + "rifle2.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/sfrifle_fire.ogg", + "shotgun.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/shotgunp_fire.ogg", + "silenced.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/Gunshot_silenced.wav", + "smg.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/smg_fire.ogg", + "sniper.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/fire/sniper_fire.ogg" + }, + "MagIn": { + "batrifle_magin.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/batrifle_magin.ogg", + "hpistol_magin.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/hpistol_magin.ogg", + "lmg_magin.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/lmg_magin.ogg", + "ltrifle_magin.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/ltrifle_magin.ogg", + "m41_reload.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/m41_reload.ogg", + "pistol_magin.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/pistol_magin.ogg", + "rifle_load.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/rifle_load.ogg", + "sfrifle_magin.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/sfrifle_magin.ogg", + "smg_magin.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/smg_magin.ogg", + "revolver_magin.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/rev_magin.ogg", + "shotgun_insert.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/shotgun_insert.ogg" + }, + "MagOut": { + "batrifle_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/batrifle_magout.ogg", + "hpistol_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/hpistol_magout.ogg", + "lmg_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/lmg_magout.ogg", + "ltrifle_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/ltrifle_magout.ogg", + "pistol_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/pistol_magout.ogg", + "revolver_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/rev_magout.ogg", + "sfrifle_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/sfrifle_magout.ogg", + "smg_magout.ogg": "https://github.com/discordia-space/CEV-Eris/blob/01f7518e0f8177734a6579aba2bbf76024aa96c4/sound/weapons/guns/interact/smg_magout.ogg" + } +} \ No newline at end of file diff --git a/Resources/Audio/items/weapons/sources.txt b/Resources/Audio/items/weapons/sources.txt deleted file mode 100644 index 03628c6ca9..0000000000 --- a/Resources/Audio/items/weapons/sources.txt +++ /dev/null @@ -1,10 +0,0 @@ -gun_empty.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/gun_empty.ogg -smg_magin.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/interact/smg_magin.ogg -smg_magout.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/interact/smg_magout.ogg -smg_empty_alarm.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/smg_empty_alarm.ogg -casingfall1.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall1.ogg -casingfall2.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall2.ogg -casingfall3.ogg: https://github.com/discordia-space/CEV-Eris/blob/fbde37a8647a82587d363da999a94cf02c2e128c/sound/weapons/guns/misc/casingfall3.ogg -pistol_cock.ogg: https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/sound/weapons/guns/interact/pistol_cock.ogg -pistol_magin.ogg: https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/sound/weapons/guns/interact/pistol_magin.ogg -pistol_magout.ogg: https://github.com/discordia-space/CEV-Eris/blob/c0293684320e7b70cbcac932b8dddeee35f3a51f/sound/weapons/guns/interact/pistol_magout.ogg diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index f3e77331f9..7d29af0570 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -2096,7 +2096,7 @@ entities: entities: [] type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer -- type: magazine_12mm_filled +- type: magazine_10mm_smg uid: 267 components: - grid: 0 @@ -2108,7 +2108,7 @@ entities: entities: [] type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer -- type: magazine_12mm_filled +- type: magazine_10mm_smg uid: 268 components: - grid: 0 @@ -2120,7 +2120,7 @@ entities: entities: [] type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer -- type: magazine_12mm_filled +- type: magazine_10mm_smg uid: 269 components: - grid: 0 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.32/ammunition.yml new file mode 100644 index 0000000000..d04f323212 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.32/ammunition.yml @@ -0,0 +1,236 @@ +# Empty mags +- type: entity + id: magazine_32_empty + name: ".32 magazine - empty" + parent: BaseItem + 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/.32/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.32/projectiles.yml new file mode 100644 index 0000000000..52a78851ed --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.32/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_32 + name: .32 Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 20 + +- type: entity + id: bullet_32f + name: .32 Bullet (Flash) + parent: bullet_basef + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 20 + +- type: entity + id: bullet_32hv + name: .32 Bullet (High-Velocity) + parent: bullet_basehv + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 24 + +- type: entity + id: bullet_32l + name: .32 Bullet (L) + parent: bullet_basel + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 20 + +- type: entity + id: bullet_32p + name: .32 Bullet (Practice) + parent: bullet_basep + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_32r + name: .32 Bullet (Rubber) + parent: bullet_baser + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.357/ammunition.yml new file mode 100644 index 0000000000..443918aef1 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.357/ammunition.yml @@ -0,0 +1,110 @@ +# Empty mags +- type: entity + id: magazine_357_empty + name: ".357 magazine - empty" + parent: BaseItem + 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/.357/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.357/projectiles.yml new file mode 100644 index 0000000000..ba346205df --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.357/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_357 + name: .357 Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 40 + +- type: entity + id: bullet_357f + name: .357 Bullet (Flash) + parent: bullet_basef + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 40 + +- type: entity + id: bullet_357hv + name: .357 Bullet (High-Velocity) + parent: bullet_basehv + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 48 + +- type: entity + id: bullet_357l + name: .357 Bullet (L) + parent: bullet_basel + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 40 + +- type: entity + id: bullet_357p + name: .357 Bullet (Practice) + parent: bullet_basep + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_357r + name: .357 Bullet (Rubber) + parent: bullet_baser + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 6 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.44/ammunition.yml new file mode 100644 index 0000000000..4e68c2cdb3 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.44/ammunition.yml @@ -0,0 +1,236 @@ +# Empty mags +- type: entity + id: magazine_44_empty + name: ".44 magazine - empty" + parent: BaseItem + 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/.44/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.44/projectiles.yml new file mode 100644 index 0000000000..38ae4f742a --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.44/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_44 + name: .44 Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 45 + +- type: entity + id: bullet_44f + name: .44 Bullet (Flash) + parent: bullet_basef + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 45 + +- type: entity + id: bullet_44hv + name: .44 Bullet (High-Velocity) + parent: bullet_basehv + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 54 + +- type: entity + id: bullet_44l + name: .44 Bullet (L) + parent: bullet_basel + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 45 + +- type: entity + id: bullet_44p + name: .44 Bullet (Practice) + parent: bullet_basep + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_44r + name: .44 Bullet (Rubber) + parent: bullet_baser + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 7 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/ammunition.yml new file mode 100644 index 0000000000..fb1ac719af --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/ammunition.yml @@ -0,0 +1,374 @@ +# Empty mags +- type: entity + id: magazine_45mm_empty + name: ".45mm magazine - empty" + parent: BaseItem + 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 + 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/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/projectiles.yml new file mode 100644 index 0000000000..6fdc3e21d3 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_45mm + name: .45mm Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 26 + +- type: entity + id: bullet_45mmf + name: .45mm Bullet (Flash) + parent: bullet_basef + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 26 + +- type: entity + id: bullet_45mmhv + name: .45mm Bullet (High-Velocity) + parent: bullet_basehv + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 24 + +- type: entity + id: bullet_45mml + name: .45mm Bullet (L) + parent: bullet_basel + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 26 + +- type: entity + id: bullet_45mmp + name: .45mm Bullet (Practice) + parent: bullet_basep + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_45mmr + name: .45mm Bullet (Rubber) + parent: bullet_baser + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 4 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml new file mode 100644 index 0000000000..4737c16ce7 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml @@ -0,0 +1,230 @@ +# Empty mags +- type: entity + id: magazine_50_empty + name: ".50 cal magazine - empty" + parent: BaseItem + 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_50f + 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_50hv + 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_50l + 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_50p + 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_50r + 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_50f + 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_50hv + 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_50l + 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_50p + 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_50r + 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/.50/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.50/projectiles.yml new file mode 100644 index 0000000000..e89e1e1d2b --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.50/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_50 + name: .50 cal Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 50 + +- type: entity + id: bullet_50f + name: .50 cal Bullet (Flash) + parent: bullet_basef + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 50 + +- type: entity + id: bullet_50hv + name: .50 cal Bullet (High-Velocity) + parent: bullet_basehv + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 60 + +- type: entity + id: bullet_50l + name: .50 cal Bullet (L) + parent: bullet_basel + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 50 + +- type: entity + id: bullet_50p + name: .50 cal Bullet (Practice) + parent: bullet_basep + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_50r + name: .50 cal Bullet (Rubber) + parent: bullet_baser + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 7 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml new file mode 100644 index 0000000000..2a12168c78 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml @@ -0,0 +1,368 @@ +# Empty mags +- type: entity + id: magazine_10mm_empty + name: "10mm magazine - empty" + parent: BaseItem + 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_f + 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/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml new file mode 100644 index 0000000000..2ce204b9f6 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_10mm + name: 10mm Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 24 + +- type: entity + id: bullet_10mmf + name: 10mm Bullet (Flash) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 24 + +- type: entity + id: bullet_10mmhv + name: 10mm Bullet (High-Velocity) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 29 + +- type: entity + id: bullet_10mml + name: 10mm Bullet (L) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 24 + +- type: entity + id: bullet_10mmp + name: 10mm Bullet (Practice) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_10mmr + name: 10mm Bullet (Rubber) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 4 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/ammunition.yml new file mode 100644 index 0000000000..fa0f8bc57d --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/ammunition.yml @@ -0,0 +1,51 @@ +# Empty mags +- type: entity + id: magazine_20mm_empty + name: "20mm magazine - empty" + parent: BaseItem + 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 new file mode 100644 index 0000000000..73a4d15034 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml @@ -0,0 +1,10 @@ +- type: entity + id: bullet_20mm + name: 20mm Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 10 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/ammunition.yml new file mode 100644 index 0000000000..f0bdc015f6 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/ammunition.yml @@ -0,0 +1,51 @@ +# Empty mags +- type: entity + id: magazine_24mm_empty + name: "24mm magazine - empty" + parent: BaseItem + 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/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml new file mode 100644 index 0000000000..27ce860395 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_24mm + name: 24mm Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 10 + +- type: entity + id: bullet_24mmf + name: 24mm Bullet (Flash) + parent: bullet_basef + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 10 + +- type: entity + id: bullet_24mmhv + name: 24mm Bullet (High-Velocity) + parent: bullet_basehv + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 27 + damages: + Brute: 15 + +- type: entity + id: bullet_24mml + name: 24mm Bullet (L) + parent: bullet_basel + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 10 + +- type: entity + id: bullet_24mmp + name: 24mm Bullet (Practice) + parent: bullet_basep + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_24mmr + name: 24mm Bullet (Rubber) + parent: bullet_baser + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/ammunition.yml new file mode 100644 index 0000000000..6fb6545341 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/ammunition.yml @@ -0,0 +1,220 @@ +# Empty mags +- type: entity + id: magazine_556mm_empty + name: "5.56mm magazine - empty" + parent: BaseItem + 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/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml new file mode 100644 index 0000000000..2f86125130 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_556mm + name: 5.56mm Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 16 + +- type: entity + id: bullet_556mmf + name: 5.56mm Bullet (Flash) + parent: bullet_basef + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 16 + +- type: entity + id: bullet_556mmhv + name: 5.56mm Bullet (High-Velocity) + parent: bullet_basehv + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 19 + +- type: entity + id: bullet_556mml + name: 5.56mm Bullet (L) + parent: bullet_basel + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 16 + +- type: entity + id: bullet_556mmp + name: 5.56mm Bullet (Practice) + parent: bullet_basep + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_556mmr + name: 5.56mm Bullet (Rubber) + parent: bullet_baser + description: If you can see this you're dead! + 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 new file mode 100644 index 0000000000..e8f2150fbe --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/ammunition.yml @@ -0,0 +1,236 @@ +# Empty mags +- type: entity + id: magazine_65mm_empty + name: "6.5mm magazine - empty" + parent: BaseItem + 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/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml new file mode 100644 index 0000000000..06e0f3b781 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_65mm + name: 6.5mm Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 18 + +- type: entity + id: bullet_65mmf + name: 6.5mm Bullet (Flash) + parent: bullet_basef + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 18 + +- type: entity + id: bullet_65mmhv + name: 6.5mm Bullet (High-Velocity) + parent: bullet_basehv + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 22 + +- type: entity + id: bullet_65mml + name: 6.5mm Bullet (L) + parent: bullet_basel + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 18 + +- type: entity + id: bullet_65mmp + name: 6.5mm Bullet (Practice) + parent: bullet_basep + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_65mmr + name: 6.5mm Bullet (Rubber) + parent: bullet_baser + description: If you can see this you're dead! + 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 new file mode 100644 index 0000000000..ff847d0b72 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/ammunition.yml @@ -0,0 +1,447 @@ +# Empty mags +- type: entity + id: magazine_762mm_empty + name: "7.62mm magazine - empty" + parent: BaseItem + 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/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml new file mode 100644 index 0000000000..f31376d364 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_762mm + name: 7.62mm Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 20 + +- type: entity + id: bullet_762mmf + name: 7.62mm Bullet (Flash) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 20 + +- type: entity + id: bullet_762mmhv + name: 7.62mm Bullet (High-Velocity) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 24 + +- type: entity + id: bullet_762mml + name: 7.62mm Bullet (L) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 20 + +- type: entity + id: bullet_762mmp + name: 7.62mm Bullet (Practice) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_762mmr + name: 7.62mm Bullet (Rubber) + parent: bullet_base + description: If you can see this you're dead! + 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 new file mode 100644 index 0000000000..0637fe5fed --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/ammunition.yml @@ -0,0 +1,396 @@ +# Empty mags +- type: entity + id: magazine_9mm_empty + name: "9mm magazine - empty" + parent: BaseItem + 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 + 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: A9mmFlash + 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: A9mmHighVelocity + 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: A9mmL + 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: A9mmPractice + 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: A9mmRubber + 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: A9mmFlash + 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: A9mmHighVelocity + 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: A9mmL + 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: A9mmPractice + 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: A9mmRubber + 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: A9mmFlash + 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: A9mmHighVelocity + 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: A9mmL + 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: A9mmPractice + 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: A9mmRubber + 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/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml new file mode 100644 index 0000000000..21446d1819 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml @@ -0,0 +1,65 @@ +- type: entity + id: bullet_9mm + name: 9mm Bullet + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 22 + +- type: entity + id: bullet_9mmf + name: 9mm Bullet (Flash) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 22 + +- type: entity + id: bullet_9mmhv + name: 9mm Bullet (High-Velocity) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 30 + damages: + Brute: 26 + +- type: entity + id: bullet_9mml + name: 9mm Bullet (L) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 22 + +- type: entity + id: bullet_9mmp + name: 9mm Bullet (Practice) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_9mmr + name: 9mm Bullet (Rubber) + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 3 diff --git a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml new file mode 100644 index 0000000000..880add1f2f --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml @@ -0,0 +1,84 @@ +- type: entity + name: BaseLMG + parent: BaseItem + id: lmg_base + description: A rooty tooty point and shooty. + components: + - type: Sound + - 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: lmg_base + id: lmg_l6 + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/LMGs/l6.rsi + state: l6-5 + - type: Icon + sprite: Objects/Guns/LMGs/l6.rsi + state: l6-5 + - 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: 6 + - type: Item + Size: 24 + sprite: Objects/Guns/LMGs/l6.rsi + +- type: entity + name: PK + parent: lmg_base + id: lmg_pk + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/LMGs/pk.rsi + state: pk-5 + - type: Icon + sprite: Objects/Guns/LMGs/pk.rsi + state: pk-5 + - type: RangedWeapon + spreadstddev: 10 + automatic: true + firerate: 8 + - type: BallisticMagazineWeapon + caliber: A762mm + magazines: + - A762mm + default_magazine: magazine_pk + - type: Appearance + visuals: + - type: BallisticMagazineWeaponVisualizer2D + base_state: pk + steps: 6 + - type: Item + Size: 24 + sprite: Objects/Guns/LMGs/pk.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/weapons/laserguns.yml b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml similarity index 94% rename from Resources/Prototypes/Entities/items/weapons/laserguns.yml rename to Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml index baea97c8c4..7f01f05263 100644 --- a/Resources/Prototypes/Entities/items/weapons/laserguns.yml +++ b/Resources/Prototypes/Entities/Weapons/Laser/laserguns.yml @@ -15,7 +15,7 @@ - type: HitscanWeapon damage: 30 fireSprite: "Objects/laser.png" - fireSound: "/Audio/laser.ogg" + fireSound: "/Audio/Guns/Gunshots/laser.ogg" lowerDischargeLimit: 10 - type: HitscanWeaponCapacitor capacity: 1200 @@ -45,7 +45,7 @@ - type: HitscanWeapon damage: 90 fireSprite: "Objects/heavylaser.png" - fireSound: "/Audio/lasercannonfire.ogg" + fireSound: "/Audio/Guns/Gunshots/laser_cannon.ogg" lowerDischargeLimit: 10 - type: HitscanWeaponCapacitor capacity: 2400 diff --git a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml new file mode 100644 index 0000000000..ed99146a92 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml @@ -0,0 +1,585 @@ +- type: entity + name: BasePistol + parent: BaseItem + id: pistol_base + description: A rooty tooty point and shooty. + components: + - type: Sound + - 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: entity + name: Clarissa + parent: pistol_base + id: pistol_clarissa + description: A rooty tooty point and shooty. + 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: entity + name: Clarissa (Silenced) + parent: pistol_base + id: pistol_clarissa_s + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Pistols/clarissa_s.rsi + state: clarissa_s-0 + - 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 + - type: Item + Size: 24 + sprite: Objects/Guns/Pistols/clarissa_s.rsi + +- type: entity + name: Deagle + parent: pistol_base + id: pistol_deagle + 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 + - 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: Appearance + visuals: + - type: BallisticMagazineWeaponVisualizer2D + base_state: deagle + steps: 1 + - type: Item + Size: 24 + sprite: Objects/Guns/Pistols/deagle.rsi + +- type: entity + name: Deckard + parent: pistol_base + id: pistol_deckard + 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: Sound + - 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: entity + name: Giskard + parent: pistol_base + id: pistol_giskard + description: A rooty tooty point and shooty. + 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: entity + name: Giskard (Silenced) + parent: pistol_base + id: pistol_giskard_s + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Pistols/giskard_s.rsi + state: giskard_s-1 + - 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 + - type: Item + Size: 24 + sprite: Objects/Guns/Pistols/giskard_s.rsi + +- type: entity + name: Gyro pistol + parent: pistol_base + id: pistol_gyro + 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 + - 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: 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: pistol_base + id: pistol_ihmp + 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: pistol_base + id: pistol_ihmp_s + 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: pistol_base + id: pistol_ihsidearm + 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: pistol_base + id: pistol_ihsidearm_s + 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: entity + name: Lamia + parent: pistol_base + id: pistol_lamia + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Pistols/lamia.rsi + state: lamia-1 + - 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 + - type: Item + Size: 24 + sprite: Objects/Guns/Pistols/lamia.rsi + +- type: entity + name: Makarov + parent: pistol_base + id: pistol_makarov + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Pistols/makarov.rsi + state: makarov-0 + - 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 + - type: Item + Size: 24 + sprite: Objects/Guns/Pistols/makarov.rsi + +- type: entity + name: Makarov (Silenced) + parent: pistol_base + id: pistol_makarov_s + 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 + - 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: entity + name: Mk 58 + parent: pistol_base + id: pistol_mk58 + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Pistols/mk58.rsi + state: mk58-1 + - 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: entity + name: Mk 58 (Wood) + parent: pistol_base + id: pistol_mk58_w + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Pistols/mk58_wood.rsi + state: mk58_wood-1 + - 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: entity + name: Olivaw civil + parent: pistol_base + id: pistol_olivawcivil + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Pistols/olivawcivil.rsi + state: olivawcivil-0 + - 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 + - type: Item + Size: 24 + sprite: Objects/Guns/Pistols/olivawcivil.rsi diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml new file mode 100644 index 0000000000..3850e480ff --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -0,0 +1,83 @@ +# One bullet to bring them all into the darkness and bind them +- type: entity + id: bullet_base + name: bullet_base + description: If you can see this you're dead! + components: + - type: Sprite + directional: false + texture: Objects/Projectiles/bullet.png + #rotation: -180 + - type: Icon + texture: Objects/Projectiles/bullet.png + - type: BoundingBox + aabb: -0.2,-0.2,0.2,0.2 + - type: Physics + edgeslide: false + - type: Projectile + damages: + Brute: 20 + - type: Collidable + hard: false + mask: 3 + +- type: entity + id: ProjectileBullet + name: ProjectileBullet + parent: bullet_base +# Placeholder bullet + +- type: entity + id: bullet_basef + name: Base Bullet Flash + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 10 + +- type: entity + id: bullet_basehv + name: Base Bullet High-Velocity + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 27 + damages: + Brute: 12 + +- type: entity + id: bullet_basel + name: Base Bullet L + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 15 + damages: + Brute: 10 + +- type: entity + id: bullet_basep + name: Base Bullet Practice + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 0 + +- type: entity + id: bullet_baser + name: Base Bullet Rubber + parent: bullet_base + description: If you can see this you're dead! + components: + - type: Projectile + velocity: 20 + damages: + Brute: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Revolvers/pistols.yml b/Resources/Prototypes/Entities/Weapons/Revolvers/pistols.yml new file mode 100644 index 0000000000..2b8c56f35b --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Revolvers/pistols.yml @@ -0,0 +1,123 @@ +#- type: entity +# name: Baserevolver +# parent: BaseItem +# id: revolver_base +# description: A rooty tooty point and shooty. +# components: +# - type: Sound +# - 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: Sound +# - 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: Sound +# - 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: Sound +# - 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml new file mode 100644 index 0000000000..0fb7aa9037 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml @@ -0,0 +1,284 @@ +- type: entity + name: BaseRifle + parent: BaseItem + id: rifle_base + description: A rooty tooty point and shooty. + components: + - type: Sound + - 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: entity + name: AK + parent: rifle_base + id: rifle_ak + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Rifles/ak.rsi + state: ak-1 + - type: Icon + sprite: Objects/Guns/Rifles/ak.rsi + state: ak-1 + - type: Sound + - 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: 2 + - type: Item + Size: 24 + sprite: Objects/Guns/Rifles/ak.rsi + +- type: entity + name: Black AK + parent: rifle_base + id: rifle_blackak + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Rifles/black-ak.rsi + state: black-ak-1 + - type: Icon + sprite: Objects/Guns/Rifles/black-ak.rsi + state: black-ak-1 + - type: Sound + - 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: 2 + - type: Item + Size: 24 + sprite: Objects/Guns/Rifles/black-AK.rsi + +- type: entity + name: Carbine + parent: rifle_base + id: rifle_carbine + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Rifles/carbine.rsi + state: carbine-5 + - type: Icon + sprite: Objects/Guns/Rifles/carbine.rsi + state: carbine-5 + - type: Sound + - 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: entity + name: Dallas + parent: rifle_base + id: rifle_dallas + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Rifles/dallas.rsi + state: dallas-0 + - type: Icon + sprite: Objects/Guns/Rifles/dallas.rsi + state: dallas-0 + - type: Sound + - 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: rifle_base + id: rifle_ihheavy + 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: Sound + - 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: Appearance + visuals: + - type: BallisticMagazineWeaponVisualizer2D + base_state: ih_heavyrifle + steps: 1 + - type: Item + Size: 24 + sprite: Objects/Guns/Rifles/ih_heavyrifle.rsi + +- type: entity + name: Sol-EOT + parent: rifle_base + id: rifle_sol_eot + description: A rooty tooty point and shooty. + 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 + 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: rifle_base + id: rifle_sol_para + 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 + 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: rifle_base + id: rifle_sts + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/Rifles/sts.rsi + state: sts-1 + - type: Icon + sprite: Objects/Guns/Rifles/sts.rsi + state: sts-1 + - 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: Appearance + visuals: + - type: BallisticMagazineWeaponVisualizer2D + base_state: sts + steps: 2 + - type: Item + Size: 24 + sprite: Objects/Guns/Rifles/sts.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml new file mode 100644 index 0000000000..b89b199ab7 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml @@ -0,0 +1,213 @@ +- type: entity + name: BaseSMG + parent: BaseItem + id: smg_base + description: A rooty tooty point and shooty. + components: + - type: Sound + - 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: entity + name: C-20r Sub Machine Gun + parent: smg_base + id: smg_c20r + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/SMGs/c20r.rsi + state: c20r-5 + - 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: entity + name: IH SMG + parent: smg_base + id: smg_ihsmg + description: Pla-ket-ket-ket-ket + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/SMGs/ih_smg.rsi + state: ih_smg-0 + - type: Icon + sprite: Objects/Guns/SMGs/ih_smg.rsi + state: ih_smg-0 + - type: Sound + - 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 + - type: Item + Size: 24 + sprite: Objects/Guns/SMGs/ih_smg.rsi + +- type: entity + name: IH SMG (Silenced) + parent: smg_base + id: smg_ihsmg_s + 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: Sound + - 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: Appearance + visuals: + - type: BallisticMagazineWeaponVisualizer2D + base_state: ih_smg_s + steps: 1 + - type: Item + Size: 24 + sprite: Objects/Guns/SMGs/ih_smg_s.rsi + +- type: entity + name: Mac + parent: smg_base + id: smg_mac + 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: Sound + - 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: smg_base + id: smg_saber + 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: Sound + - 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 + parent: smg_base + id: smg_wt550 + description: A rooty tooty point and shooty. + components: + - type: Sprite + netsync: false + sprite: Objects/Guns/SMGs/wt550.rsi + state: wt550-5 + - type: Icon + sprite: Objects/Guns/SMGs/wt550.rsi + state: wt550-5 + - type: Sound + - 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/items/explosives.yml b/Resources/Prototypes/Entities/items/explosives.yml index 689faadaa4..e7b379e5b9 100644 --- a/Resources/Prototypes/Entities/items/explosives.yml +++ b/Resources/Prototypes/Entities/items/explosives.yml @@ -55,7 +55,7 @@ Size: 5 - type: OnUseTimerTrigger - delay: 3.5 + delay: 5 - type: Explosive devastationRange: 3 diff --git a/Resources/Prototypes/Entities/items/weapons/ammunition.yml b/Resources/Prototypes/Entities/items/weapons/ammunition.yml deleted file mode 100644 index 7e2a273fc2..0000000000 --- a/Resources/Prototypes/Entities/items/weapons/ammunition.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: entity - id: magazine_12mm - name: "12mm magazine" - parent: BaseItem - components: - - type: BallisticMagazine - caliber: A12mm - magazine: A12mm - capacity: 20 - - type: Icon - sprite: Objects/items/magazine_12mm.rsi - state: 12mm-0 - - type: Sprite - netsync: false - sprite: Objects/items/magazine_12mm.rsi - state: 12mm-0 - - type: Appearance - visuals: - - type: BallisticMagazineVisualizer2D - base_state: 12mm - steps: 11 - -- type: entity - id: magazine_12mm_filled - name: "12mm magazine" - parent: magazine_12mm - components: - - type: BallisticMagazine - fill: ammo_casing_12mm - - type: Icon - state: 12mm-10 - - type: Sprite - state: 12mm-10 - -- type: entity - id: ammo_casing_12mm - name: "12mm bullet" - parent: BaseItem - components: - - type: BallisticBullet - caliber: A12mm - projectile: ProjectileBullet - - type: Sprite - sprite: Objects/items/ammo_casing.rsi - state: s-casing - drawdepth: FloorObjects - - type: Icon - sprite: Objects/items/ammo_casing.rsi - state: s-casing - diff --git a/Resources/Prototypes/Entities/items/weapons/guns.yml b/Resources/Prototypes/Entities/items/weapons/guns.yml deleted file mode 100644 index 686ade94a9..0000000000 --- a/Resources/Prototypes/Entities/items/weapons/guns.yml +++ /dev/null @@ -1,36 +0,0 @@ -- type: entity - name: C-20r Sub Machine Gun - parent: BaseItem - id: smg_c20r - description: A rooty tooty point and shooty. - components: - - type: Sprite - netsync: false - sprite: Objects/c20r.rsi - state: c20r-5 - - type: Icon - sprite: Objects/c20r.rsi - state: c20r-5 - - type: Sound - - type: RangedWeapon - automatic: true - firerate: 8 - - type: BallisticMagazineWeapon - caliber: A12mm - magazine: A12mm - default_magazine: magazine_12mm_filled - auto_eject_magazine: true - sound_auto_eject: /Audio/items/weapons/smg_empty_alarm.ogg - sound_magazine_in: /Audio/items/weapons/smg_magin.ogg - sound_magazine_out: /Audio/items/weapons/smg_magout.ogg - sound_empty: /Audio/items/weapons/gun_empty.ogg - - - type: Appearance - visuals: - - type: BallisticMagazineWeaponVisualizer2D - base_state: c20r - steps: 6 - - - type: Item - Size: 24 - sprite: Objects/c20r.rsi diff --git a/Resources/Prototypes/Entities/items/weapons/projectiles.yml b/Resources/Prototypes/Entities/items/weapons/projectiles.yml deleted file mode 100644 index 1c3d99de7b..0000000000 --- a/Resources/Prototypes/Entities/items/weapons/projectiles.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: entity - id: ProjectileBullet - name: ProjectileBullet - description: If you can see this you're dead! - components: - - type: Sprite - directional: false - texture: Objects/projectilebullet.png - #rotation: -180 - - - type: Icon - texture: Objects/projectilebullet.png - - type: BoundingBox - aabb: -0.2,-0.2,0.2,0.2 - - type: Physics - edgeslide: false - - type: Projectile - - type: Collidable - hard: false - mask: 3 diff --git a/Resources/Prototypes/Entities/markers/construction_ghost.yml b/Resources/Prototypes/Entities/markers/construction_ghost.yml index e6748c67a5..568dbe84ea 100644 --- a/Resources/Prototypes/Entities/markers/construction_ghost.yml +++ b/Resources/Prototypes/Entities/markers/construction_ghost.yml @@ -9,6 +9,8 @@ - type: ConstructionGhost - type: BoundingBox - type: Clickable + baseshader: unshaded + selectionshader: selection_outline_unshaded - type: entity name: somebody-messed-up frame 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 new file mode 100644 index 0000000000..4e77690512 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma-0.png 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 new file mode 100644 index 0000000000..ccfd6a4288 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma-1.png 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 new file mode 100644 index 0000000000..ccfd6a4288 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.rsi/32trauma.png 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 new file mode 100644 index 0000000000..6de6c882a1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma.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/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 new file mode 100644 index 0000000000..7367fad832 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f-0.png 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 new file mode 100644 index 0000000000..9488bdbc29 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f-1.png 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 new file mode 100644 index 0000000000..9488bdbc29 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.rsi/32trauma_f.png 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 new file mode 100644 index 0000000000..0982e1e668 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_f.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/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 new file mode 100644 index 0000000000..2ddc4c714f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv-0.png 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 new file mode 100644 index 0000000000..19ec7b8ece Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv-1.png 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 new file mode 100644 index 0000000000..19ec7b8ece Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.rsi/32trauma_hv.png 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 new file mode 100644 index 0000000000..f8445be71f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_hv.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/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 new file mode 100644 index 0000000000..8f2b28b411 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l-0.png 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 new file mode 100644 index 0000000000..db31de3786 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l-1.png 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 new file mode 100644 index 0000000000..db31de3786 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.rsi/32trauma_l.png 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 new file mode 100644 index 0000000000..9f2df46e39 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_l.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/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 new file mode 100644 index 0000000000..0d9f92b4b7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p-0.png 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 new file mode 100644 index 0000000000..de268dbfa9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p-1.png 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 new file mode 100644 index 0000000000..de268dbfa9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.rsi/32trauma_p.png 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 new file mode 100644 index 0000000000..5160102f6f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_p.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/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 new file mode 100644 index 0000000000..a5671ec3e0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r-0.png 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 new file mode 100644 index 0000000000..a5d56f600c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r-1.png 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 new file mode 100644 index 0000000000..a5d56f600c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.rsi/32trauma_r.png 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 new file mode 100644 index 0000000000..1591e70d2b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.32/32trauma_r.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/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 new file mode 100644 index 0000000000..54dc96cb6c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-0.png new file mode 100644 index 0000000000..040bff48fe Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-0.png differ 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/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-1.png new file mode 100644 index 0000000000..278d1a5a87 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-1.png differ 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 new file mode 100644 index 0000000000..3de351fff7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-2.png 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 new file mode 100644 index 0000000000..cd21b85fd6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-3.png 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 new file mode 100644 index 0000000000..38fc6bd080 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-4.png 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 new file mode 100644 index 0000000000..f24d1ee664 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44-5.png 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 new file mode 100644 index 0000000000..f24d1ee664 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44.rsi/mg_ih_pst_44.png 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 new file mode 100644 index 0000000000..9e1c452c2d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-0.png new file mode 100644 index 0000000000..cd402aac77 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-0.png differ 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/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-1.png new file mode 100644 index 0000000000..f379ceb72c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-1.png differ 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 new file mode 100644 index 0000000000..442ef75ff2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-2.png 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 new file mode 100644 index 0000000000..0cd3e2c2f6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-3.png 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 new file mode 100644 index 0000000000..0ee8ae8436 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-4.png 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 new file mode 100644 index 0000000000..f2c1287b44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f-5.png 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 new file mode 100644 index 0000000000..f2c1287b44 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44f.rsi/mg_ih_pst_44f.png 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 new file mode 100644 index 0000000000..bd617ec7d8 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-0.png new file mode 100644 index 0000000000..89af6cd51c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-0.png differ 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/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-1.png new file mode 100644 index 0000000000..21232149b8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-1.png differ 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 new file mode 100644 index 0000000000..8194d6ec6f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-2.png 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 new file mode 100644 index 0000000000..b1b4b8f25a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-3.png 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 new file mode 100644 index 0000000000..e227f0da2a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-4.png 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 new file mode 100644 index 0000000000..8bc32081cd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv-5.png 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 new file mode 100644 index 0000000000..8bc32081cd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44hv.rsi/mg_ih_pst_44hv.png 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 new file mode 100644 index 0000000000..3e4c2341af --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-0.png new file mode 100644 index 0000000000..d3be1ff3f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-0.png differ 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/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-1.png new file mode 100644 index 0000000000..2d950bc78b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-1.png differ 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 new file mode 100644 index 0000000000..f2a8f04c30 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-2.png 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 new file mode 100644 index 0000000000..1d5de735a7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-3.png 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 new file mode 100644 index 0000000000..6fb955ec8b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-4.png 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 new file mode 100644 index 0000000000..359b461ec3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l-5.png 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 new file mode 100644 index 0000000000..359b461ec3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44l.rsi/mg_ih_pst_44l.png 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 new file mode 100644 index 0000000000..5f936e3af7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-0.png new file mode 100644 index 0000000000..ced08df4b4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-0.png differ 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/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-1.png new file mode 100644 index 0000000000..6a87f54203 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-1.png differ 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 new file mode 100644 index 0000000000..b51421fb37 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-2.png 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 new file mode 100644 index 0000000000..7083ff842d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-3.png 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 new file mode 100644 index 0000000000..35a75fd1c3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-4.png 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 new file mode 100644 index 0000000000..afdb4dfb17 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p-5.png 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 new file mode 100644 index 0000000000..afdb4dfb17 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44p.rsi/mg_ih_pst_44p.png 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 new file mode 100644 index 0000000000..b9976cace2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-0.png new file mode 100644 index 0000000000..5f9f10ba9b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-0.png differ 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/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-1.png new file mode 100644 index 0000000000..de84c13a22 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-1.png differ 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 new file mode 100644 index 0000000000..31a2f0b154 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-2.png 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 new file mode 100644 index 0000000000..6249190197 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-3.png 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 new file mode 100644 index 0000000000..f814d16045 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-4.png 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 new file mode 100644 index 0000000000..21a6d3f640 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r-5.png 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 new file mode 100644 index 0000000000..21a6d3f640 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.44/mg_ih_pst_44r.rsi/mg_ih_pst_44r.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-0.png new file mode 100644 index 0000000000..0064338a50 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-0.png 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 new file mode 100644 index 0000000000..f9c4c1c4f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-2.png new file mode 100644 index 0000000000..5cb13dd32d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-2.png 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 new file mode 100644 index 0000000000..f9c4c1c4f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-3.png 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 new file mode 100644 index 0000000000..2f705c43c0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-4.png 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 new file mode 100644 index 0000000000..e62fb28867 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-5.png 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 new file mode 100644 index 0000000000..db5021b415 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-6.png 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 new file mode 100644 index 0000000000..dd2b64e3d3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-7.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-8.png new file mode 100644 index 0000000000..5cb13dd32d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45-8.png 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 new file mode 100644 index 0000000000..5cb13dd32d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.rsi/45.png 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 new file mode 100644 index 0000000000..0f566cb841 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-0.png new file mode 100644 index 0000000000..7910e3ea7f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-0.png differ 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 new file mode 100644 index 0000000000..e0efb7fb39 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-2.png new file mode 100644 index 0000000000..fae421fb5f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-2.png 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 new file mode 100644 index 0000000000..e0efb7fb39 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-3.png 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 new file mode 100644 index 0000000000..a4a55205d1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-4.png 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 new file mode 100644 index 0000000000..fba4e4b540 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-5.png 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 new file mode 100644 index 0000000000..1d0f640135 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-6.png 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 new file mode 100644 index 0000000000..bf36bedb2c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-7.png 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 new file mode 100644 index 0000000000..fae421fb5f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f-8.png 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 new file mode 100644 index 0000000000..fae421fb5f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.rsi/45f.png 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 new file mode 100644 index 0000000000..f1cf0bee3d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45f.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-0.png new file mode 100644 index 0000000000..8280184573 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-0.png differ 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 new file mode 100644 index 0000000000..074f2d8f22 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-2.png new file mode 100644 index 0000000000..64d5b7f216 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-2.png 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 new file mode 100644 index 0000000000..074f2d8f22 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-3.png 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 new file mode 100644 index 0000000000..51e9f7a3fd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-4.png 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 new file mode 100644 index 0000000000..feb710b39a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-5.png 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 new file mode 100644 index 0000000000..5edba2c3b0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-6.png 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 new file mode 100644 index 0000000000..c3f4d9f52c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-7.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-8.png new file mode 100644 index 0000000000..64d5b7f216 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv-8.png 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 new file mode 100644 index 0000000000..64d5b7f216 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.rsi/45hv.png 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 new file mode 100644 index 0000000000..0be587af35 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45hv.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-0.png new file mode 100644 index 0000000000..fbe93746f1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-0.png differ 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 new file mode 100644 index 0000000000..649fae4ab5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-2.png new file mode 100644 index 0000000000..f6d42a0402 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-2.png 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 new file mode 100644 index 0000000000..649fae4ab5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-3.png 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 new file mode 100644 index 0000000000..7a93907827 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-4.png 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 new file mode 100644 index 0000000000..9acb1d68ce Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-5.png 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 new file mode 100644 index 0000000000..94ea756dcd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-6.png 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 new file mode 100644 index 0000000000..6ddeac1e7b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-7.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-8.png new file mode 100644 index 0000000000..f6d42a0402 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l-8.png 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 new file mode 100644 index 0000000000..f6d42a0402 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.rsi/45l.png 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 new file mode 100644 index 0000000000..7bb562858f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45l.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-0.png new file mode 100644 index 0000000000..e5d2fdf4a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-0.png differ 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 new file mode 100644 index 0000000000..a653b45ac9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-2.png new file mode 100644 index 0000000000..ff09f2eb79 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-2.png 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 new file mode 100644 index 0000000000..a653b45ac9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-3.png 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 new file mode 100644 index 0000000000..38579d682e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-4.png 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 new file mode 100644 index 0000000000..42ecaddd7f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-5.png 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 new file mode 100644 index 0000000000..4654af6419 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-6.png 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 new file mode 100644 index 0000000000..f21cc36266 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-7.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-8.png new file mode 100644 index 0000000000..ff09f2eb79 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p-8.png 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 new file mode 100644 index 0000000000..ff09f2eb79 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.rsi/45p.png 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 new file mode 100644 index 0000000000..415f2206a9 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45p.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-0.png new file mode 100644 index 0000000000..58c5644ed4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-0.png differ 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 new file mode 100644 index 0000000000..181b5ad647 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-2.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-2.png new file mode 100644 index 0000000000..681af36b78 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-2.png 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 new file mode 100644 index 0000000000..181b5ad647 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-3.png 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 new file mode 100644 index 0000000000..4bc8517be2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-4.png 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 new file mode 100644 index 0000000000..6d8d2b19ab Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-5.png 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 new file mode 100644 index 0000000000..5481a4ce15 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-6.png 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 new file mode 100644 index 0000000000..a02b592a69 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-7.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-8.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-8.png new file mode 100644 index 0000000000..681af36b78 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r-8.png 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 new file mode 100644 index 0000000000..681af36b78 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.rsi/45r.png 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 new file mode 100644 index 0000000000..31b0bb7d0d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/45r.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/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 new file mode 100644 index 0000000000..413c6df5e6 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.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/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 new file mode 100644 index 0000000000..cf7da81ee6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45-0.png 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 new file mode 100644 index 0000000000..14d567434c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45-1.png 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 new file mode 100644 index 0000000000..14d567434c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45.rsi/smg45.png 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 new file mode 100644 index 0000000000..4e993663d2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.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/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 new file mode 100644 index 0000000000..270e6c8890 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-0.png 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 new file mode 100644 index 0000000000..f4d98be55b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-1.png 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 new file mode 100644 index 0000000000..bb8f9547a3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f-2.png 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 new file mode 100644 index 0000000000..bb8f9547a3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45f.rsi/smg45f.png 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 new file mode 100644 index 0000000000..ac3b0d0001 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.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/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 new file mode 100644 index 0000000000..d2a06377ac Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv-0.png 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 new file mode 100644 index 0000000000..e3ae30e182 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv-1.png 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 new file mode 100644 index 0000000000..e3ae30e182 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45hv.rsi/smg45hv.png 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 new file mode 100644 index 0000000000..1bda2c7746 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.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/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 new file mode 100644 index 0000000000..3523d2b8b6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l-0.png 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 new file mode 100644 index 0000000000..64f7fe1753 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l-1.png 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 new file mode 100644 index 0000000000..64f7fe1753 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45l.rsi/smg45l.png 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 new file mode 100644 index 0000000000..9abe1c1939 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.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/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 new file mode 100644 index 0000000000..5d0ccec4a7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/smg45p-0.png 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 new file mode 100644 index 0000000000..5d0ccec4a7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45p.rsi/smg45p.png 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 new file mode 100644 index 0000000000..bb96db5ea2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.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/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 new file mode 100644 index 0000000000..31b1071aee Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r-0.png 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 new file mode 100644 index 0000000000..71610cf542 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r-1.png 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 new file mode 100644 index 0000000000..71610cf542 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.45mm/smg45r.rsi/smg45r.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-0.png new file mode 100644 index 0000000000..0064338a50 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-0.png 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 new file mode 100644 index 0000000000..5cb13dd32d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae-1.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae.png new file mode 100644 index 0000000000..5cb13dd32d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.rsi/50ae.png 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 new file mode 100644 index 0000000000..ef2c2f5695 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ae.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/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 new file mode 100644 index 0000000000..7910e3ea7f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef-0.png 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 new file mode 100644 index 0000000000..fae421fb5f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef-1.png 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 new file mode 100644 index 0000000000..fae421fb5f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.rsi/50aef.png 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 new file mode 100644 index 0000000000..542b4ce7e5 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aef.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv-0.png new file mode 100644 index 0000000000..8280184573 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv-0.png differ 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 new file mode 100644 index 0000000000..64d5b7f216 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv-1.png 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 new file mode 100644 index 0000000000..64d5b7f216 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi/50aehv.png 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 new file mode 100644 index 0000000000..b198e25348 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aehv.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael-0.png new file mode 100644 index 0000000000..fbe93746f1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael-0.png differ 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 new file mode 100644 index 0000000000..f6d42a0402 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael-1.png 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 new file mode 100644 index 0000000000..f6d42a0402 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.rsi/50ael.png 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 new file mode 100644 index 0000000000..6ef96e3c7b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50ael.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep-0.png new file mode 100644 index 0000000000..e5d2fdf4a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep-0.png differ 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 new file mode 100644 index 0000000000..ff09f2eb79 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep-1.png 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 new file mode 100644 index 0000000000..ff09f2eb79 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.rsi/50aep.png 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 new file mode 100644 index 0000000000..6ac788d048 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aep.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer-0.png new file mode 100644 index 0000000000..58c5644ed4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer-0.png differ 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 new file mode 100644 index 0000000000..681af36b78 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer-1.png 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 new file mode 100644 index 0000000000..681af36b78 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.rsi/50aer.png 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 new file mode 100644 index 0000000000..0d3cbe5f41 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/.50/50aer.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/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 new file mode 100644 index 0000000000..bac7030752 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-0.png 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 new file mode 100644 index 0000000000..3c82c80221 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-1.png 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 new file mode 100644 index 0000000000..c467541c1f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-2.png 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 new file mode 100644 index 0000000000..54fc9e402d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-3.png 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 new file mode 100644 index 0000000000..d786592c07 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10-4.png 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 new file mode 100644 index 0000000000..d786592c07 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.rsi/10.png 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 new file mode 100644 index 0000000000..ebc270f596 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10.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/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 new file mode 100644 index 0000000000..ed938cc6e0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-0.png 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 new file mode 100644 index 0000000000..86dac666e8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-1.png 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 new file mode 100644 index 0000000000..b797ead597 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-2.png 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 new file mode 100644 index 0000000000..f37ac6fedf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-3.png 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 new file mode 100644 index 0000000000..aacbb79436 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f-4.png 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 new file mode 100644 index 0000000000..aacbb79436 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.rsi/10f.png 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 new file mode 100644 index 0000000000..3bc693ff03 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10f.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/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 new file mode 100644 index 0000000000..c5a1b711c8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-0.png 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 new file mode 100644 index 0000000000..27d89d5ada Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-1.png 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 new file mode 100644 index 0000000000..c5c9e01140 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-2.png 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 new file mode 100644 index 0000000000..53c2c88359 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-3.png 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 new file mode 100644 index 0000000000..dccaa76a56 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv-4.png 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 new file mode 100644 index 0000000000..dccaa76a56 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.rsi/10hv.png 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 new file mode 100644 index 0000000000..a0455a12de --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10hv.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/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 new file mode 100644 index 0000000000..ccc517a1c6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-0.png 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 new file mode 100644 index 0000000000..7cda0f0608 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-1.png 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 new file mode 100644 index 0000000000..a731f74f22 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-2.png 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 new file mode 100644 index 0000000000..cd4cceda48 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-3.png 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 new file mode 100644 index 0000000000..d4e9653435 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l-4.png 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 new file mode 100644 index 0000000000..d4e9653435 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.rsi/10l.png 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 new file mode 100644 index 0000000000..0b621edc33 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10l.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/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 new file mode 100644 index 0000000000..ca9ea1c3c2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-0.png 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 new file mode 100644 index 0000000000..527d254ba7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-1.png 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 new file mode 100644 index 0000000000..a8832e827b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-2.png 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 new file mode 100644 index 0000000000..2c60927370 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-3.png 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 new file mode 100644 index 0000000000..26d483adb5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p-4.png 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 new file mode 100644 index 0000000000..26d483adb5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.rsi/10p.png 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 new file mode 100644 index 0000000000..4a11878ae3 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10p.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/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 new file mode 100644 index 0000000000..f55acb8266 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-0.png 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 new file mode 100644 index 0000000000..4c63799f13 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-1.png 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 new file mode 100644 index 0000000000..792a6088df Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-2.png 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 new file mode 100644 index 0000000000..1c5828be77 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-3.png 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 new file mode 100644 index 0000000000..eafc2cbc6d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r-4.png 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 new file mode 100644 index 0000000000..eafc2cbc6d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.rsi/10r.png 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 new file mode 100644 index 0000000000..38b27c9b10 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/10r.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/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 new file mode 100644 index 0000000000..3c8d74b58a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf-0.png 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 new file mode 100644 index 0000000000..bca95849a2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf-1.png 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 new file mode 100644 index 0000000000..bca95849a2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.rsi/12mmf.png 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 new file mode 100644 index 0000000000..b15d389285 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmf.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/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 new file mode 100644 index 0000000000..7faf35de52 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv-0.png 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 new file mode 100644 index 0000000000..b5099c9dc0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv-1.png 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 new file mode 100644 index 0000000000..b5099c9dc0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.rsi/12mmhv.png 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 new file mode 100644 index 0000000000..d28b7f77df --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmhv.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/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 new file mode 100644 index 0000000000..d8f8d0d74f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml-0.png 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 new file mode 100644 index 0000000000..4c59a44558 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml-1.png 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 new file mode 100644 index 0000000000..4c59a44558 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.rsi/12mml.png 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 new file mode 100644 index 0000000000..8af111d58d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mml.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/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 new file mode 100644 index 0000000000..d76ee4aea1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp-0.png 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 new file mode 100644 index 0000000000..d6b31f96d4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp-1.png 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 new file mode 100644 index 0000000000..d6b31f96d4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.rsi/12mmp.png 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 new file mode 100644 index 0000000000..ad386b3192 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmp.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/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 new file mode 100644 index 0000000000..8e9f574e55 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr-0.png 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 new file mode 100644 index 0000000000..0df254105a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr-1.png 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 new file mode 100644 index 0000000000..0df254105a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.rsi/12mmr.png 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 new file mode 100644 index 0000000000..1239574476 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/10mm/12mmr.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/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 new file mode 100644 index 0000000000..ee8536455c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75-0.png 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 new file mode 100644 index 0000000000..b5da2f5794 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75-1.png 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 new file mode 100644 index 0000000000..b5da2f5794 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.rsi/75.png 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 new file mode 100644 index 0000000000..fd5ea342d1 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/20mm/75.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-0.png new file mode 100644 index 0000000000..09cc70d6ef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-0.png differ 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 new file mode 100644 index 0000000000..03d174c7ae Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-1.png 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 new file mode 100644 index 0000000000..65eb75c02c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-2.png 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 new file mode 100644 index 0000000000..04da587747 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-3.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-4.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-4.png new file mode 100644 index 0000000000..9a0cfee6b6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24-4.png 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 new file mode 100644 index 0000000000..9a0cfee6b6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.rsi/10x24.png 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 new file mode 100644 index 0000000000..b013fad32a --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/24mm/10x24.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/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 new file mode 100644 index 0000000000..ee8536455c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56-0.png 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 new file mode 100644 index 0000000000..b5da2f5794 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56-1.png 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 new file mode 100644 index 0000000000..b5da2f5794 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.rsi/5.56.png 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 new file mode 100644 index 0000000000..947ba89f99 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56.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/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 new file mode 100644 index 0000000000..fd3be497f9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s-0.png 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 new file mode 100644 index 0000000000..9040b7821d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s-1.png 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 new file mode 100644 index 0000000000..9040b7821d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.rsi/5.56s.png 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 new file mode 100644 index 0000000000..b9df60db7d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/5.56s.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/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 new file mode 100644 index 0000000000..b9c7d16d2a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-1.png new file mode 100644 index 0000000000..cd7f89823d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag-1.png 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 new file mode 100644 index 0000000000..cd7f89823d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.rsi/WinMag.png 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 new file mode 100644 index 0000000000..05685aa91e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h-0.png new file mode 100644 index 0000000000..829fcd6d59 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h-0.png differ 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/5.56mm/WinMag_h.rsi/WinMag_h-1.png new file mode 100644 index 0000000000..72d850aadf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h-1.png differ 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 new file mode 100644 index 0000000000..72d850aadf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.rsi/WinMag_h.png 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 new file mode 100644 index 0000000000..6930d75303 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_h.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/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 new file mode 100644 index 0000000000..f13485a3d0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r-0.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/5.56mm/WinMag_r.rsi/WinMag_r-1.png new file mode 100644 index 0000000000..508a73c36e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r-1.png 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 new file mode 100644 index 0000000000..508a73c36e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.rsi/WinMag_r.png 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 new file mode 100644 index 0000000000..34386f7f5c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/5.56mm/WinMag_r.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/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 new file mode 100644 index 0000000000..620e204226 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-0.png new file mode 100644 index 0000000000..1108df2138 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-0.png differ 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 new file mode 100644 index 0000000000..b9c7d16d2a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-1.png 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 new file mode 100644 index 0000000000..8ed18ba28f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-2.png 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 new file mode 100644 index 0000000000..cd7f89823d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol-3.png 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 new file mode 100644 index 0000000000..cd7f89823d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol.rsi/mg_ih_sol.png 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 new file mode 100644 index 0000000000..77a84ad3de --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.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/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 new file mode 100644 index 0000000000..a370e7f0bc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-0.png differ 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/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-1.png new file mode 100644 index 0000000000..2cd64d37e1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-1.png 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 new file mode 100644 index 0000000000..3a533b65fc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-2.png differ 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/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-3.png new file mode 100644 index 0000000000..2a1ea31d84 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f-3.png 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 new file mode 100644 index 0000000000..2a1ea31d84 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_f.rsi/mg_ih_sol_f.png 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 new file mode 100644 index 0000000000..8af5a2fba2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.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/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 new file mode 100644 index 0000000000..823292807a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-0.png differ 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/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-1.png new file mode 100644 index 0000000000..5d4f0f47b8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-1.png 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 new file mode 100644 index 0000000000..b7d1f94a17 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-2.png differ 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/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-3.png new file mode 100644 index 0000000000..2333c60012 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv-3.png 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 new file mode 100644 index 0000000000..2333c60012 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_hv.rsi/mg_ih_sol_hv.png 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 new file mode 100644 index 0000000000..886e84583f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.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/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 new file mode 100644 index 0000000000..81b1637f12 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-0.png 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 new file mode 100644 index 0000000000..829fcd6d59 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-1.png 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 new file mode 100644 index 0000000000..7158befa61 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-2.png 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 new file mode 100644 index 0000000000..72d850aadf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l-3.png 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 new file mode 100644 index 0000000000..72d850aadf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_l.rsi/mg_ih_sol_l.png 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 new file mode 100644 index 0000000000..e9ea39aa3d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.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/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 new file mode 100644 index 0000000000..c583bfdb2c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-0.png differ 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/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-1.png new file mode 100644 index 0000000000..18aab251ab Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-1.png 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 new file mode 100644 index 0000000000..e2605795f2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-2.png differ 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/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-3.png new file mode 100644 index 0000000000..b2cd3d45ec Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p-3.png 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 new file mode 100644 index 0000000000..b2cd3d45ec Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_p.rsi/mg_ih_sol_p.png 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 new file mode 100644 index 0000000000..d282a446a9 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.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/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 new file mode 100644 index 0000000000..c7d76652c4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-0.png 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 new file mode 100644 index 0000000000..c7d76652c4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-1.png 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 new file mode 100644 index 0000000000..1d302b1009 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-2.png 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 new file mode 100644 index 0000000000..508a73c36e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r-3.png 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 new file mode 100644 index 0000000000..508a73c36e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/6.5mm/mg_ih_sol_r.rsi/mg_ih_sol_r.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-0.png new file mode 100644 index 0000000000..3de8407c8c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-1.png new file mode 100644 index 0000000000..690ff77b12 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag-1.png 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 new file mode 100644 index 0000000000..690ff77b12 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.rsi/AKMag.png 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 new file mode 100644 index 0000000000..3987cff323 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f-0.png new file mode 100644 index 0000000000..837797e930 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f-0.png differ 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/7.62mm/AKMag_f.rsi/AKMag_f-1.png new file mode 100644 index 0000000000..1b77b851d6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f-1.png differ 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 new file mode 100644 index 0000000000..1b77b851d6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.rsi/AKMag_f.png 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 new file mode 100644 index 0000000000..93e023a1c2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_f.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv-0.png new file mode 100644 index 0000000000..6caeb4ef98 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv-0.png differ 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/7.62mm/AKMag_hv.rsi/AKMag_hv-1.png new file mode 100644 index 0000000000..53349f4692 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv-1.png differ 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 new file mode 100644 index 0000000000..53349f4692 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.rsi/AKMag_hv.png 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 new file mode 100644 index 0000000000..e8510ffad4 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_hv.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l-0.png new file mode 100644 index 0000000000..d138b4005d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l-0.png differ 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/7.62mm/AKMag_l.rsi/AKMag_l-1.png new file mode 100644 index 0000000000..b77ffd8187 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l-1.png differ 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 new file mode 100644 index 0000000000..b77ffd8187 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.rsi/AKMag_l.png 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 new file mode 100644 index 0000000000..6586e762b7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_l.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p-0.png new file mode 100644 index 0000000000..a0fe559911 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p-0.png differ 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/7.62mm/AKMag_p.rsi/AKMag_p-1.png new file mode 100644 index 0000000000..806b881a60 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p-1.png differ 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 new file mode 100644 index 0000000000..806b881a60 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.rsi/AKMag_p.png 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 new file mode 100644 index 0000000000..58b4394a95 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_p.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r-0.png new file mode 100644 index 0000000000..6d492c7f64 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r-0.png differ 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/7.62mm/AKMag_r.rsi/AKMag_r-1.png new file mode 100644 index 0000000000..cc6359b439 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r-1.png differ 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 new file mode 100644 index 0000000000..cc6359b439 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.rsi/AKMag_r.png 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 new file mode 100644 index 0000000000..8ab5540e15 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AKMag_r.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short-0.png new file mode 100644 index 0000000000..29e6c7d6bd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short-0.png differ 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/7.62mm/AK_short.rsi/AK_short-1.png new file mode 100644 index 0000000000..1800b1d61f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short-1.png differ 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 new file mode 100644 index 0000000000..1800b1d61f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.rsi/AK_short.png 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 new file mode 100644 index 0000000000..05d3b9fecb --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f-0.png new file mode 100644 index 0000000000..9f1109656f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f-0.png differ 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/7.62mm/AK_short_f.rsi/AK_short_f-1.png new file mode 100644 index 0000000000..7f4c62c9fc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f-1.png differ 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 new file mode 100644 index 0000000000..7f4c62c9fc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.rsi/AK_short_f.png 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 new file mode 100644 index 0000000000..b521d2f61e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_f.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv-0.png new file mode 100644 index 0000000000..ac48cd8a41 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv-0.png differ 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/7.62mm/AK_short_hv.rsi/AK_short_hv-1.png new file mode 100644 index 0000000000..ecf4b59886 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv-1.png differ 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 new file mode 100644 index 0000000000..ecf4b59886 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.rsi/AK_short_hv.png 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 new file mode 100644 index 0000000000..9a47c4391b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_hv.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l-0.png new file mode 100644 index 0000000000..05db933351 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l-0.png differ 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/7.62mm/AK_short_l.rsi/AK_short_l-1.png new file mode 100644 index 0000000000..ab03b01371 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l-1.png differ 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 new file mode 100644 index 0000000000..ab03b01371 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.rsi/AK_short_l.png 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 new file mode 100644 index 0000000000..8727329dec --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_l.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p-0.png new file mode 100644 index 0000000000..dc1c69b16d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p-0.png differ 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/7.62mm/AK_short_p.rsi/AK_short_p-1.png new file mode 100644 index 0000000000..95b350727b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p-1.png differ 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 new file mode 100644 index 0000000000..95b350727b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.rsi/AK_short_p.png 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 new file mode 100644 index 0000000000..fcf8577baa --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_p.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r-0.png new file mode 100644 index 0000000000..bbc6047d61 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r-0.png differ 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/7.62mm/AK_short_r.rsi/AK_short_r-1.png new file mode 100644 index 0000000000..80ff862d88 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r-1.png differ 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 new file mode 100644 index 0000000000..80ff862d88 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.rsi/AK_short_r.png 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 new file mode 100644 index 0000000000..4fbf69be04 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/AK_short_r.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-0.png new file mode 100644 index 0000000000..cb448146c6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-0.png differ 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 new file mode 100644 index 0000000000..54c1ed75f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-1.png 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 new file mode 100644 index 0000000000..cf472a2aa5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-2.png 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 new file mode 100644 index 0000000000..0496083445 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-3.png 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 new file mode 100644 index 0000000000..2b8b90f916 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-5.png new file mode 100644 index 0000000000..e1f5c4a1af Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762-5.png 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 new file mode 100644 index 0000000000..e1f5c4a1af Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.rsi/a762.png 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 new file mode 100644 index 0000000000..7942e47c7b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762.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/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 new file mode 100644 index 0000000000..cb448146c6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-0.png 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 new file mode 100644 index 0000000000..54c1ed75f0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-1.png 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 new file mode 100644 index 0000000000..cf472a2aa5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-2.png 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 new file mode 100644 index 0000000000..0496083445 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-3.png 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 new file mode 100644 index 0000000000..2b8b90f916 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-4.png 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 new file mode 100644 index 0000000000..e1f5c4a1af Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine-5.png 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 new file mode 100644 index 0000000000..cb448146c6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/a762_magazine.png 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 new file mode 100644 index 0000000000..faed3403e3 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/a762_magazine.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-0.png new file mode 100644 index 0000000000..ff1e671fed Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-1.png new file mode 100644 index 0000000000..e36e9a21e9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762-1.png differ 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 new file mode 100644 index 0000000000..e36e9a21e9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.rsi/c762.png 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 new file mode 100644 index 0000000000..4af0cd0f6a --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-0.png new file mode 100644 index 0000000000..3b4a4dba15 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-1.png new file mode 100644 index 0000000000..c34a056ece Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f-1.png differ 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 new file mode 100644 index 0000000000..c34a056ece Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.rsi/c762f.png 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 new file mode 100644 index 0000000000..2bfbd2b1f2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762f.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-0.png new file mode 100644 index 0000000000..85550ec8df Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-1.png new file mode 100644 index 0000000000..a44b6ed3d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv-1.png differ 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 new file mode 100644 index 0000000000..a44b6ed3d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.rsi/c762hv.png 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 new file mode 100644 index 0000000000..ed80516a6b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762hv.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-0.png new file mode 100644 index 0000000000..40cb526164 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-1.png new file mode 100644 index 0000000000..1641c3591a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l-1.png differ 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 new file mode 100644 index 0000000000..1641c3591a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.rsi/c762l.png 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 new file mode 100644 index 0000000000..b4b9e80d6f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762l.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-0.png new file mode 100644 index 0000000000..ecaaabacb7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-1.png new file mode 100644 index 0000000000..846e052f4a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p-1.png differ 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 new file mode 100644 index 0000000000..846e052f4a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.rsi/c762p.png 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 new file mode 100644 index 0000000000..148d0b98e5 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762p.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-0.png new file mode 100644 index 0000000000..af1c4acc0f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-1.png new file mode 100644 index 0000000000..e50893989e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r-1.png differ 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 new file mode 100644 index 0000000000..e50893989e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.rsi/c762r.png 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 new file mode 100644 index 0000000000..553541e77c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/c762r.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-0.png new file mode 100644 index 0000000000..e7f246bc29 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-1.png new file mode 100644 index 0000000000..e3d3c0a186 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim-1.png differ 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 new file mode 100644 index 0000000000..e3d3c0a186 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/maxim.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/maxim.rsi/meta.json new file mode 100644 index 0000000000..04a019c1ae --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/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": "maxim", + "directions": 1 + }, + { + "name": "maxim-0", + "directions": 1 + }, + { + "name": "maxim-1", + "directions": 1 + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000000..19d3507f6f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-0.png new file mode 100644 index 0000000000..7a2009d86b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-0.png differ 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 new file mode 100644 index 0000000000..2e8644c139 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-1.png 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 new file mode 100644 index 0000000000..2c38121f4b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-2.png 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 new file mode 100644 index 0000000000..6c6d5e9628 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-3.png 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 new file mode 100644 index 0000000000..0dc4cc75ba Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box.png new file mode 100644 index 0000000000..6f6f401dcb Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/7.62mm/pk_box.rsi/pk_box.png 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 new file mode 100644 index 0000000000..f73b18d765 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-0.png 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 new file mode 100644 index 0000000000..9bb095072c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-1.png 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 new file mode 100644 index 0000000000..2859e93a43 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-2.png 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 new file mode 100644 index 0000000000..e3722c32d1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-3.png 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 new file mode 100644 index 0000000000..734033c630 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-4.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-5.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-5.png new file mode 100644 index 0000000000..1b89b4a9ab Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt-5.png 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 new file mode 100644 index 0000000000..1b89b4a9ab Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.rsi/9mmt.png 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 new file mode 100644 index 0000000000..8bf6cef27d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9mmt.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-0.png new file mode 100644 index 0000000000..ee08a1c9ad Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-1.png new file mode 100644 index 0000000000..285483cff7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p-1.png differ 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 new file mode 100644 index 0000000000..285483cff7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.rsi/9x19p.png 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 new file mode 100644 index 0000000000..5023efc91d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19p.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-0.png new file mode 100644 index 0000000000..dd4541b16b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-1.png new file mode 100644 index 0000000000..b4c2878453 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf-1.png differ 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 new file mode 100644 index 0000000000..b4c2878453 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.rsi/9x19pf.png 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 new file mode 100644 index 0000000000..2d0c539a7f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pf.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-0.png new file mode 100644 index 0000000000..5e6367194c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-1.png new file mode 100644 index 0000000000..ef5353437b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv-1.png differ 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 new file mode 100644 index 0000000000..ef5353437b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.rsi/9x19phv.png 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 new file mode 100644 index 0000000000..50e336f3c6 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19phv.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/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/9x19pl-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl-0.png new file mode 100644 index 0000000000..b546c0880a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl.png new file mode 100644 index 0000000000..b546c0880a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.rsi/9x19pl.png differ 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 new file mode 100644 index 0000000000..3906f541e4 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pl.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-0.png new file mode 100644 index 0000000000..02483aef06 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-1.png new file mode 100644 index 0000000000..99aa029e73 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp-1.png differ 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 new file mode 100644 index 0000000000..99aa029e73 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.rsi/9x19pp.png 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 new file mode 100644 index 0000000000..0624700da3 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pp.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-0.png new file mode 100644 index 0000000000..21a98703c3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-1.png new file mode 100644 index 0000000000..10726c2bda Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr-1.png differ 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 new file mode 100644 index 0000000000..10726c2bda Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.rsi/9x19pr.png 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 new file mode 100644 index 0000000000..658866079d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/9x19pr.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/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 new file mode 100644 index 0000000000..675ce9b41f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-0.png new file mode 100644 index 0000000000..90e20a9a55 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-1.png new file mode 100644 index 0000000000..c720b63c4a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm-1.png differ 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 new file mode 100644 index 0000000000..c720b63c4a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mm.rsi/smg9mm.png 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 new file mode 100644 index 0000000000..9f5430dbfd --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-0.png new file mode 100644 index 0000000000..53f8421613 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-1.png new file mode 100644 index 0000000000..b21b7ea0a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf-1.png differ 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 new file mode 100644 index 0000000000..b21b7ea0a8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmf.rsi/smg9mmf.png 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 new file mode 100644 index 0000000000..659b4fe077 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-0.png new file mode 100644 index 0000000000..9ba2d07943 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-1.png new file mode 100644 index 0000000000..e431932424 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv-1.png differ 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 new file mode 100644 index 0000000000..e431932424 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmhv.rsi/smg9mmhv.png 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 new file mode 100644 index 0000000000..e394da9a46 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-0.png new file mode 100644 index 0000000000..386e428483 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-1.png new file mode 100644 index 0000000000..5c69cb88b9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml-1.png differ 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 new file mode 100644 index 0000000000..5c69cb88b9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mml.rsi/smg9mml.png 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 new file mode 100644 index 0000000000..be793472ad --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-0.png new file mode 100644 index 0000000000..b62c38e252 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-1.png new file mode 100644 index 0000000000..184135d07e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp-1.png differ 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 new file mode 100644 index 0000000000..184135d07e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmp.rsi/smg9mmp.png 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 new file mode 100644 index 0000000000..cd5b8ba5f6 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.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/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-0.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-0.png new file mode 100644 index 0000000000..b4d551edc6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-0.png differ diff --git a/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-1.png b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-1.png new file mode 100644 index 0000000000..5f6569bad7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr-1.png differ 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 new file mode 100644 index 0000000000..5f6569bad7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/9mm/smg9mmr.rsi/smg9mmr.png differ 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 new file mode 100644 index 0000000000..dd82c98e30 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-0.png 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 new file mode 100644 index 0000000000..53978b7884 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-1.png 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 new file mode 100644 index 0000000000..46125c5eba Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-2.png 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 new file mode 100644 index 0000000000..6811f36bd6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-3.png 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 new file mode 100644 index 0000000000..45f9a322d9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-4.png 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 new file mode 100644 index 0000000000..1e21b9caa1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts-5.png 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 new file mode 100644 index 0000000000..1e21b9caa1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.rsi/darts.png 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 new file mode 100644 index 0000000000..b64557eb3b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Magazine/unique/darts.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/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/items/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/items/ammo_casing.rsi/meta.json rename to Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/meta.json diff --git a/Resources/Textures/Objects/items/ammo_casing.rsi/s-casing.png b/Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/s-casing.png similarity index 100% rename from Resources/Textures/Objects/items/ammo_casing.rsi/s-casing.png rename to Resources/Textures/Objects/Guns/Ammunition/ammo_casing.rsi/s-casing.png diff --git a/Resources/Textures/Objects/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/inhand-left.png rename to Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-left.png diff --git a/Resources/Textures/Objects/c20r.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/inhand-right.png rename to Resources/Textures/Objects/Guns/LMGs/l6.rsi/inhand-right.png diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png new file mode 100644 index 0000000000..c4979a921e Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-0.png 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 new file mode 100644 index 0000000000..2ed78d7823 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-1.png 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 new file mode 100644 index 0000000000..93a813859f Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-2.png 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 new file mode 100644 index 0000000000..041dfc3ce2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-3.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png new file mode 100644 index 0000000000..1309e4ab80 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-4.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-5.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-5.png new file mode 100644 index 0000000000..484a678c9e Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6-5.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6.png b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6.png new file mode 100644 index 0000000000..c4979a921e Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/l6.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json new file mode 100644 index 0000000000..5f061a3821 --- /dev/null +++ b/Resources/Textures/Objects/Guns/LMGs/l6.rsi/meta.json @@ -0,0 +1,110 @@ +{ + "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/lmg.dmi", + "states": [ + { + "name": "l6-5", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "l6-4", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "l6-3", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "l6-2", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "l6-1", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "l6-0", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "l6", + "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/LMGs/pk.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json new file mode 100644 index 0000000000..ce7c79f729 --- /dev/null +++ b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/meta.json @@ -0,0 +1,110 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "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": "pk-1", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "pk-2", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "pk-3", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "pk-4", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "pk-5", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "pk", + "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/LMGs/pk.rsi/pk-0.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png new file mode 100644 index 0000000000..c5cc775277 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-0.png 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 new file mode 100644 index 0000000000..28d858a66d Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-1.png 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 new file mode 100644 index 0000000000..b67be31fe1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-2.png 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 new file mode 100644 index 0000000000..000ad1d308 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-3.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png new file mode 100644 index 0000000000..b73ea28783 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-4.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png new file mode 100644 index 0000000000..61951f164c Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk-5.png differ diff --git a/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk.png b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk.png new file mode 100644 index 0000000000..c5cc775277 Binary files /dev/null and b/Resources/Textures/Objects/Guns/LMGs/pk.rsi/pk.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 new file mode 100644 index 0000000000..c6bc7d90a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png new file mode 100644 index 0000000000..263beda755 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-1.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-2.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-2.png new file mode 100644 index 0000000000..b04dd7b896 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa-2.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa.png b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa.png new file mode 100644 index 0000000000..263beda755 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/clarissa.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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/meta.json new file mode 100644 index 0000000000..dfda2f23d9 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/clarissa.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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", + "directions": 1 + }, + { + "name": "clarissa-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/clarissa_s.rsi/clarissa_s-0.png b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s-0.png new file mode 100644 index 0000000000..85cf594a7a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s-0.png 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 new file mode 100644 index 0000000000..b04dd7b896 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/clarissa_s.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-right.png new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..cdc1622237 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/clarissa_s.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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/deagle.rsi/deagle-0.png b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle-0.png new file mode 100644 index 0000000000..898f13e880 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle.png b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle.png new file mode 100644 index 0000000000..1d374c40aa Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/deagle.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/meta.json new file mode 100644 index 0000000000..9dd213f237 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/deagle.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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 new file mode 100644 index 0000000000..8f8ff842e6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-0.png 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 new file mode 100644 index 0000000000..2dba7a387c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-1.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-2.png b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-2.png new file mode 100644 index 0000000000..cf14e2eca9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard-2.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard.png b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard.png new file mode 100644 index 0000000000..69aecf9f15 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/deckard.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/meta.json new file mode 100644 index 0000000000..31291f1f56 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/deckard.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "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": "deckard", + "directions": 1 + }, + { + "name": "deckard-0", + "directions": 1 + }, + { + "name": "deckard-1", + "directions": 1 + }, + { + "name": "deckard-2", + "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/giskard.rsi/giskard-0.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-0.png new file mode 100644 index 0000000000..92de30d271 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-1.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-1.png new file mode 100644 index 0000000000..a2013e87ba Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard-1.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard.png new file mode 100644 index 0000000000..b5bc2ab4ad Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/giskard.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/meta.json new file mode 100644 index 0000000000..aff3c60427 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/giskard.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "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", + "directions": 1 + }, + { + "name": "giskard-0", + "directions": 1 + }, + { + "name": "giskard-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/giskard_s.rsi/giskard_s-0.png b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-0.png new file mode 100644 index 0000000000..090a187300 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-0.png 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 new file mode 100644 index 0000000000..8cf5cdf58f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s-1.png 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 new file mode 100644 index 0000000000..ac91a54213 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/giskard_s.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..1e3934729d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/giskard_s.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "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/gyropistol.rsi/gyropistol-0.png b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol-0.png new file mode 100644 index 0000000000..2ef463592c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol.png b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol.png new file mode 100644 index 0000000000..126536e145 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/gyropistol.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/meta.json new file mode 100644 index 0000000000..f1fc240a94 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/gyropistol.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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/ih_mp.rsi/ih_mp-0.png b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-0.png new file mode 100644 index 0000000000..9a8636f796 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-0.png 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 new file mode 100644 index 0000000000..ad129e2d19 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp-1.png 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 new file mode 100644 index 0000000000..15acfe3c7e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/ih_mp.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..2b8732ea85 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/ih_mp.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "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 new file mode 100644 index 0000000000..c9d5695912 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s-0.png 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 new file mode 100644 index 0000000000..4e59390fef Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s-1.png 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 new file mode 100644 index 0000000000..bca0df9826 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/ih_mp_s.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..00c8ced373 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/ih_mp_s.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "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 new file mode 100644 index 0000000000..628d443caf Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm-0.png 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 new file mode 100644 index 0000000000..d58186238b Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm-1.png 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 new file mode 100644 index 0000000000..5bdccc1577 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/ih_sidearm.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..8705a4dadf --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "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 new file mode 100644 index 0000000000..4208379ff8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s-0.png 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 new file mode 100644 index 0000000000..aee0f34cf5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s-1.png 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 new file mode 100644 index 0000000000..2d0d720e46 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/ih_sidearm_s.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..8f2120694b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/ih_sidearm_s.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "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/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null 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 new file mode 100644 index 0000000000..4093c17209 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia-0.png 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 new file mode 100644 index 0000000000..af40a26bdd Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia-1.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia.png b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia.png new file mode 100644 index 0000000000..494f07bff9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/lamia.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/lamia.rsi/meta.json new file mode 100644 index 0000000000..96f0fd3157 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/lamia.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/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 diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..a1c55d2e25 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov.png b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov.png new file mode 100644 index 0000000000..a1c55d2e25 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/makarov.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/meta.json new file mode 100644 index 0000000000..9655451540 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/makarov.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..228e2c2277 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/makarov_s-0.png 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 new file mode 100644 index 0000000000..228e2c2277 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/makarov_s.png 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 new file mode 100644 index 0000000000..00fa3b08a2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/makarov_s.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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/mk58.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/meta.json new file mode 100644 index 0000000000..d1978dbdc2 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "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", + "directions": 1 + }, + { + "name": "mk58-0", + "directions": 1 + }, + { + "name": "mk58-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/mk58.rsi/mk58-0.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-0.png new file mode 100644 index 0000000000..e31a3302b8 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-1.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-1.png new file mode 100644 index 0000000000..08fd96aa99 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58-1.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58.png b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58.png new file mode 100644 index 0000000000..5dd69bbb3c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58.rsi/mk58.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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null 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/meta.json b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/meta.json new file mode 100644 index 0000000000..1ec0a4652c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.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/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 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 new file mode 100644 index 0000000000..c60dabf0f6 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood-0.png 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 new file mode 100644 index 0000000000..271a3c44d0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood-1.png 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 new file mode 100644 index 0000000000..283b4eb54d Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/mk58_wood.rsi/mk58_wood.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/meta.json b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/meta.json new file mode 100644 index 0000000000..b16c6c67f7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.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/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-0.png b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil-0.png new file mode 100644 index 0000000000..3cfba5cbea Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil-0.png differ diff --git a/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil.png b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil.png new file mode 100644 index 0000000000..50f3e731ea Binary files /dev/null and b/Resources/Textures/Objects/Guns/Pistols/olivawcivil.rsi/olivawcivil.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector-0.png b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector-0.png new file mode 100644 index 0000000000..1fcff2d6a1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector-0.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector.png b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector.png new file mode 100644 index 0000000000..1fcff2d6a1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/inspector.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/meta.json new file mode 100644 index 0000000000..f32d398064 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Revolvers/inspector.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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": "inspector", + "directions": 1 + }, + { + "name": "inspector-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/Revolvers/mateba.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null 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 new file mode 100644 index 0000000000..4ab02b8fe0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba-0.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba.png b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba.png new file mode 100644 index 0000000000..4ab02b8fe0 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/mateba.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/meta.json new file mode 100644 index 0000000000..3ec8c6a4b3 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Revolvers/mateba.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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": "mateba", + "directions": 1 + }, + { + "name": "mateba-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/Revolvers/revolver.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/meta.json b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/meta.json new file mode 100644 index 0000000000..66b288609f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/meta.json @@ -0,0 +1,74 @@ +{ + "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 new file mode 100644 index 0000000000..0ebb1d4450 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver-0.png 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 new file mode 100644 index 0000000000..eab616dbd1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver-1.png differ diff --git a/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver.png b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver.png new file mode 100644 index 0000000000..0ebb1d4450 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Revolvers/revolver.rsi/revolver.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png new file mode 100644 index 0000000000..0a2e483e6c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png new file mode 100644 index 0000000000..1bb1bcc76e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak-1.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak.png new file mode 100644 index 0000000000..8b0ad7e372 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/ak.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/ak.rsi/meta.json new file mode 100644 index 0000000000..f6ca6d93d4 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/ak.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/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "ak", "directions": 1}, {"name": "ak-0", "directions": 1}, {"name": "ak-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/Rifles/black-ak.rsi/black-ak-0.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png new file mode 100644 index 0000000000..f32d56b9ac Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png new file mode 100644 index 0000000000..2dd6de65fc Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak-1.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak.png b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak.png new file mode 100644 index 0000000000..a0ad21aae4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/black-ak.png differ 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..7bbc73d7d7 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..2d20b938a4 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/meta.json b/Resources/Textures/Objects/Guns/Rifles/black-ak.rsi/meta.json new file mode 100644 index 0000000000..c4d6b6a1d4 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/black-ak.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/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "black-ak", "directions": 1}, {"name": "black-ak-0", "directions": 1}, {"name": "black-ak-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/Rifles/carbine.rsi/carbine-0.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-0.png new file mode 100644 index 0000000000..3af7b68975 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-0.png 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 new file mode 100644 index 0000000000..3af7b68975 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-1.png 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 new file mode 100644 index 0000000000..51f9df6f22 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-2.png 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 new file mode 100644 index 0000000000..51f9df6f22 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-3.png 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 new file mode 100644 index 0000000000..51f9df6f22 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-4.png 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 new file mode 100644 index 0000000000..51f9df6f22 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine-5.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine.png b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine.png new file mode 100644 index 0000000000..2adde5e87e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/carbine.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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/carbine.rsi/meta.json new file mode 100644 index 0000000000..72dce6fd98 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/carbine.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/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 diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas-0.png b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas-0.png new file mode 100644 index 0000000000..7923d84629 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas.png b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas.png new file mode 100644 index 0000000000..763ffc03d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/dallas.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/dallas.rsi/meta.json new file mode 100644 index 0000000000..9305b8de2c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/dallas.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/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 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 new file mode 100644 index 0000000000..1d2369a576 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/ih_heavyrifle-0.png 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 new file mode 100644 index 0000000000..31e4347e9f Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/ih_heavyrifle.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..a8c1e0e2a4 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/ih_heavyrifle.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/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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..add01031c8 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "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 new file mode 100644 index 0000000000..d1c741d04e Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-0.png 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 new file mode 100644 index 0000000000..f07eef5541 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-1.png 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 new file mode 100644 index 0000000000..3d06da1f0a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-2.png 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 new file mode 100644 index 0000000000..1455b7cac7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-3.png 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 new file mode 100644 index 0000000000..f67fcd4f28 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot-4.png 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 new file mode 100644 index 0000000000..a9468b30a2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-eot.rsi/sol-eot.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..4c38319c87 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/meta.json @@ -0,0 +1,71 @@ +{ + "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 new file mode 100644 index 0000000000..e33f85d648 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-0.png 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 new file mode 100644 index 0000000000..01e44c65eb Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-1.png 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 new file mode 100644 index 0000000000..b02006ccd3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-2.png 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 new file mode 100644 index 0000000000..225698822a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-3.png 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 new file mode 100644 index 0000000000..a143c26997 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para-4.png 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 new file mode 100644 index 0000000000..70c16dab6c Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sol-para.rsi/sol-para.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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/meta.json new file mode 100644 index 0000000000..a1034d7db3 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Rifles/sts.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/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi", "states": [{"name": "sts", "directions": 1}, {"name": "sts-0", "directions": 1}, {"name": "sts-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/Rifles/sts.rsi/sts-0.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png new file mode 100644 index 0000000000..45c0790de3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-0.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-1.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-1.png new file mode 100644 index 0000000000..8c5ff49faa Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts-1.png differ diff --git a/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts.png b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts.png new file mode 100644 index 0000000000..0070268e9a Binary files /dev/null and b/Resources/Textures/Objects/Guns/Rifles/sts.rsi/sts.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-0.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-0.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/c20r-0.png rename to Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-0.png diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-1.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-1.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/c20r-1.png rename to Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-1.png diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-2.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-2.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/c20r-2.png rename to Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-2.png diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-3.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-3.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/c20r-3.png rename to Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-3.png diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-4.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-4.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/c20r-4.png rename to Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-4.png diff --git a/Resources/Textures/Objects/c20r.rsi/c20r-5.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-5.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/c20r-5.png rename to Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r-5.png diff --git a/Resources/Textures/Objects/c20r.rsi/c20r.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r.png similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/c20r.png rename to Resources/Textures/Objects/Guns/SMGs/c20r.rsi/c20r.png diff --git a/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/c20r.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/c20r.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/c20r.rsi/meta.json rename to Resources/Textures/Objects/Guns/SMGs/c20r.rsi/meta.json 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 new file mode 100644 index 0000000000..5110bb0347 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/ih_smg-0.png 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 new file mode 100644 index 0000000000..68b3a6483e Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/ih_smg.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..337d8eda24 --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/ih_smg.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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 new file mode 100644 index 0000000000..6117bf465d Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/ih_smg_s-0.png 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 new file mode 100644 index 0000000000..262684aefb Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/ih_smg_s.png 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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..894acc6aa3 --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/ih_smg_s.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/inhand-right.png 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 new file mode 100644 index 0000000000..d6a113300e Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac.png b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac.png new file mode 100644 index 0000000000..03d8e32ca5 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/mac.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/mac.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/mac.rsi/meta.json new file mode 100644 index 0000000000..6d9778df3f --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/mac.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/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 new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/inhand-left.png 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 new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/meta.json new file mode 100644 index 0000000000..2ea3b35fe7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/saber.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/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 new file mode 100644 index 0000000000..049318f1e2 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber-0.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber.png b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber.png new file mode 100644 index 0000000000..14a3426af3 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/saber.rsi/saber.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/inhand-left.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/inhand-left.png new file mode 100644 index 0000000000..7bbc73d7d7 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/inhand-right.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/inhand-right.png new file mode 100644 index 0000000000..2d20b938a4 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/meta.json new file mode 100644 index 0000000000..1e3ec25a06 --- /dev/null +++ b/Resources/Textures/Objects/Guns/SMGs/wt550.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/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 diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-0.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-0.png new file mode 100644 index 0000000000..98f78cdcba Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-0.png 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 new file mode 100644 index 0000000000..c13cb6744f Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-1.png 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 new file mode 100644 index 0000000000..e2399b3877 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-2.png 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 new file mode 100644 index 0000000000..dede95b8b9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-3.png 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 new file mode 100644 index 0000000000..d0fad12c39 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-4.png 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 new file mode 100644 index 0000000000..4fffada3c9 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550-5.png differ diff --git a/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550.png b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550.png new file mode 100644 index 0000000000..a1ae4339c1 Binary files /dev/null and b/Resources/Textures/Objects/Guns/SMGs/wt550.rsi/wt550.png differ diff --git a/Resources/Textures/Objects/Projectiles/buckshot.png b/Resources/Textures/Objects/Projectiles/buckshot.png new file mode 100644 index 0000000000..b01a999a54 Binary files /dev/null and b/Resources/Textures/Objects/Projectiles/buckshot.png differ diff --git a/Resources/Textures/Objects/projectilebullet.png b/Resources/Textures/Objects/Projectiles/bullet.png similarity index 100% rename from Resources/Textures/Objects/projectilebullet.png rename to Resources/Textures/Objects/Projectiles/bullet.png diff --git a/Resources/Textures/Objects/Projectiles/copyright.json b/Resources/Textures/Objects/Projectiles/copyright.json new file mode 100644 index 0000000000..64ef2340c6 --- /dev/null +++ b/Resources/Textures/Objects/Projectiles/copyright.json @@ -0,0 +1,13 @@ +[ + {"name": "buckshot", + "source": "https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/projectiles.dmi", + "copyright": ""}, + + {"name": "bullet", + "source": "", + "copyright": ""}, + + {"name": "plasma", + "source": "https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/projectiles.dmi", + "copyright": ""} +] \ No newline at end of file diff --git a/Resources/Textures/Objects/Projectiles/plasma.png b/Resources/Textures/Objects/Projectiles/plasma.png new file mode 100644 index 0000000000..c94779d864 Binary files /dev/null and b/Resources/Textures/Objects/Projectiles/plasma.png differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-0.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-0.png deleted file mode 100644 index 0f693f78ec..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-0.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-1.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-1.png deleted file mode 100644 index f3bfbadc0d..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-10.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-10.png deleted file mode 100644 index d73be4d480..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-10.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-2.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-2.png deleted file mode 100644 index 41783f5bdd..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-3.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-3.png deleted file mode 100644 index 25d4402931..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-4.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-4.png deleted file mode 100644 index bbc7568ced..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-5.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-5.png deleted file mode 100644 index c8ea365d96..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-6.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-6.png deleted file mode 100644 index 20e563a505..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-7.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-7.png deleted file mode 100644 index 3b737239d5..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-7.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-8.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-8.png deleted file mode 100644 index cae73c2b31..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-8.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-9.png b/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-9.png deleted file mode 100644 index 13e8fbd0d2..0000000000 Binary files a/Resources/Textures/Objects/items/magazine_12mm.rsi/12mm-9.png and /dev/null differ diff --git a/Resources/Textures/Objects/items/magazine_12mm.rsi/meta.json b/Resources/Textures/Objects/items/magazine_12mm.rsi/meta.json deleted file mode 100644 index a0ba166ed1..0000000000 --- a/Resources/Textures/Objects/items/magazine_12mm.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": "12mm-0", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-1", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-10", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-2", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-3", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-4", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-5", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-6", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-7", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-8", "directions": 1, "delays": [[1.0]]}, {"name": "12mm-9", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/projectileweapon.png b/Resources/Textures/Objects/projectileweapon.png deleted file mode 100644 index 404463fce8..0000000000 Binary files a/Resources/Textures/Objects/projectileweapon.png and /dev/null differ