Add more dakka (#307)

* Add more dakka

Some slight codebase changes to facilitate more robust behaviour.

* Update Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs

Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Remix last stereo to mono

hpistol + ltrifle

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

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<DamageType, int> damages = new Dictionary<DamageType, int>();
+        private Dictionary<DamageType, int> _damages;
+        [ViewVariables]
+        public Dictionary<DamageType, int> 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<DamageType, int>());
+            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)

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,
     }
 }

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<BallisticMagazineType> _magazineTypes;
 
         [ViewVariables]
-        public BallisticMagazineType MagazineType => _magazineType;
+        public List<BallisticMagazineType> 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>{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<SoundComponent>().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;

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<ProjectileComponent>().IgnoreEntity(user);
+            var velocity = projectile.GetComponent<ProjectileComponent>().Velocity;
 
             //Give it the velocity this weapon gives to things it fires from itself
-            projectile.GetComponent<PhysicsComponent>().LinearVelocity = angle.ToVec() * _velocity;
+            projectile.GetComponent<PhysicsComponent>().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<SoundComponent>().Play("/Audio/gunshot_c20.ogg");
+            Owner.GetComponent<SoundComponent>().Play(_soundGunshot);
         }
 
         /// <summary>
@@ -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,
     }
 }

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);
             }

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"
+    }
+}

Resources/Audio/items/weapons/sources.txt

@@ -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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Resources/Prototypes/Entities/items/explosives.yml

@@ -55,7 +55,7 @@
     Size: 5
 
   - type: OnUseTimerTrigger
-    delay: 3.5
+    delay: 5
 
   - type: Explosive
     devastationRange: 3

Resources/Prototypes/Entities/items/weapons/ammunition.yml

@@ -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
-

Resources/Prototypes/Entities/items/weapons/guns.yml

@@ -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

Resources/Prototypes/Entities/items/weapons/projectiles.yml

@@ -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

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

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}]}

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}]}