Port Randomly Fire Dropped Weapons

Content.Server/Weapons/Ranged/Systems/FireOnDropSystem.cs

@@ -0,0 +1,27 @@
+using Content.Shared.Throwing;
+using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.Random;
+
+namespace Content.Server.Weapons.Ranged.Systems;
+
+public sealed class FireOnDropSystem : EntitySystem
+{
+    [Dependency] private readonly SharedGunSystem _gun = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GunComponent, ThrowDoHitEvent>(HandleLand);
+    }
+
+
+    private void HandleLand(EntityUid uid, GunComponent component, ref ThrowDoHitEvent args)
+    {
+        if (_random.Prob(component.FireOnDropChance))
+            _gun.AttemptShoot(uid, uid, component, Transform(uid).Coordinates.Offset(Transform(uid).LocalRotation.ToVec()));
+    }
+}

Content.Shared/Weapons/Ranged/Components/GunComponent.cs

@@ -229,6 +229,12 @@ public sealed partial class GunComponent : Component
     /// </summary>
     [DataField]
     public bool ClumsyProof = false;
+
+    /// <summary>
+    ///     The percentage chance of a given gun to accidentally discharge if violently thrown into a wall or person
+    /// </summary>
+    [DataField]
+    public float FireOnDropChance = 0.1f;
 }
 
 [Flags]

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml

@@ -22,6 +22,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
+    fireOnDropChance: 1
   - type: AmmoCounter
   - type: Appearance
   - type: GenericVisualizer

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -18,6 +18,7 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+    fireOnDropChance: 0.15
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
   - type: Battery

Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -99,6 +99,15 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
+  - type: Gun
+    fireRate: 6
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/pistol.ogg
+    fireOnDropChance: 0.3
 
 - type: entity
   name: cobra
@@ -125,6 +134,7 @@
         volume: -14
     availableModes:
     - SemiAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -169,6 +179,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+    fireOnDropChance: 0.5
 
 - type: entity
   id: WeaponPistolMk58Nonlethal
@@ -198,7 +209,7 @@
   name: N1984
   parent: BaseWeaponPistol
   id: WeaponPistolN1984 # the spaces in description are for formatting.
-  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber. 
+  description: The sidearm of any self respecting officer.     Comes in .45 magnum, the lord's caliber.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/N1984.rsi
@@ -219,6 +230,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
+    fireOnDropChance: 0.6
   - type: ItemSlots
     slots:
       gun_magazine:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -29,6 +29,7 @@
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+    fireOnDropChance: 0.5
   - type: UseDelay
     delay: 0.66
   - type: ContainerContainer
@@ -127,6 +128,7 @@
       path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
       params:
         volume: 2.25
+    fireOnDropChance: 0.3
 
 - type: entity
   name: Python
@@ -155,6 +157,7 @@
     sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
   - type: Gun
     fireRate: 1
+    fireOnDropChance: 1
   - type: ContainerContainer
     containers:
       revolver-ammo: !type:Container

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -67,6 +67,7 @@
     fireRate: 5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+    fireOnDropChance: 0.5
   - type: ChamberMagazineAmmoProvider
     soundRack:
       path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
@@ -159,6 +160,7 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
+    fireOnDropChance: 0.2
   - type: ItemSlots
     slots:
       gun_magazine:

Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -72,6 +72,7 @@
     fireRate: 10
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
+    fireOnDropChance: 0.3
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -96,6 +97,7 @@
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
+    fireOnDropChance: 0.3
   - type: ChamberMagazineAmmoProvider
     autoEject: true
   - type: MagazineVisuals
@@ -126,6 +128,7 @@
         path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
       availableModes:
         - FullAuto
+      fireOnDropChance: 0.2
     - type: ItemSlots
       slots:
         gun_magazine:
@@ -173,6 +176,7 @@
       path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
     availableModes:
     - FullAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -225,6 +229,7 @@
     selectedMode: FullAuto
     availableModes:
     - FullAuto
+    fireOnDropChance: 0.1
   - type: ItemSlots
     slots:
       gun_magazine:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -28,6 +28,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
+    fireOnDropChance: 0.2
   - type: BallisticAmmoProvider
     whitelist:
       tags:
@@ -75,6 +76,7 @@
       path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
+    fireOnDropChance: 0.3
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -115,6 +117,7 @@
     heldPrefix: db
   - type: Gun
     fireRate: 2
+    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -190,6 +193,7 @@
     heldPrefix: sawn
   - type: Gun
     fireRate: 4
+    fireOnDropChance: 0.5
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -226,6 +230,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi
   - type: Gun
     fireRate: 4
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: Construction
@@ -250,6 +255,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi
   - type: Gun
     fireRate: 2
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
   - type: StaticPrice
@@ -273,6 +279,7 @@
     heldPrefix: improvised
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
+    fireOnDropChance: 1
   - type: BallisticAmmoProvider
     capacity: 1
     proto: null

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -46,6 +46,14 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+  - type: Gun
+    fireRate: 0.75
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
+    fireOnDropChance: 1
 
 - type: entity
   name: Hristov
@@ -82,6 +90,7 @@
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
+    fireOnDropChance: 1
   - type: UseDelayOnShoot
   - type: UseDelay
     delay: 8 #it's a musket
@@ -111,6 +120,7 @@
   - type: Gun
     minAngle: 0
     maxAngle: 30 #miss him entirely because the barrel is smoothbore
+    fireOnDropChance: 1
   - type: Item
     size: Small
     storedRotation: 90