Stamina damage (#9230)

Resources/Audio/Weapons/Guns/Gunshots/license.txt

@@ -1,2 +1,5 @@
 atreides.ogg, c-20r.ogg, flaregun.ogg, mateba.ogg, minigun.ogg, mk58.ogg were taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons
 They are licensed under CC-BY-SA 3.0
+
+taser2.ogg was taken from https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac
+It is licensed under CC-BY-SA 3.0

Resources/Locale/en-US/damage/stamina.ftl

@@ -0,0 +1 @@
+stamina-resist = Resisted

Resources/Locale/en-US/stunnable/components/stunbaton-component.ftl

@@ -1,5 +1,7 @@
 ### Stunbaton component
 
+comp-stunbaton-stun = Stunned
+
 ## Used when examining the stunbaton
 
 comp-stunbaton-examined-on = The light is currently [color=darkgreen]on[/color].
@@ -11,4 +13,4 @@ comp-stunbaton-activated-low-charge = Insufficient charge...
 
 stunbaton-component-low-charge = Insufficient charge...
 stunbaton-component-on-examine = The light is currently [color=darkgreen]on[/color].
-stunbaton-component-on-examine-charge = The charge indicator reads {$charge} %
+stunbaton-component-on-examine-charge = The charge indicator reads {$charge} %

Resources/Maps/bagel.yml

@@ -41157,23 +41157,6 @@ entities:
     pos: 13.5,-38.5
     parent: 60
     type: Transform
-- uid: 2177
-  type: ShellShotgunFlash
-  components:
-  - pos: 11.711429,-35.299614
-    parent: 60
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 2178
-  type: ShellShotgunFlash
-  components:
-  - rot: 0.0007520564831793308 rad
-    pos: 11.738948,-35.53393
-    parent: 60
-    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 2179
   type: ShellShotgunBeanbag
   components:

Resources/Maps/marathon.yml

@@ -27317,30 +27317,6 @@ entities:
     type: Transform
   - canCollide: False
     type: Physics
-- uid: 680
-  type: ShellShotgunFlash
-  components:
-  - pos: -11.704681,19.266298
-    parent: 30
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 681
-  type: ShellShotgunFlash
-  components:
-  - pos: -11.517181,19.250673
-    parent: 30
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 682
-  type: ShellShotgunFlash
-  components:
-  - pos: -11.329681,19.250673
-    parent: 30
-    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 683
   type: ClothingEyesGlassesSunglasses
   components:

Resources/Maps/nss_pillar.yml

@@ -74639,14 +74639,6 @@ entities:
   - pos: 11.5,13.5
     parent: 130
     type: Transform
-- uid: 7568
-  type: ShellShotgunFlash
-  components:
-  - pos: 1.4405079,19.67595
-    parent: 130
-    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 7569
   type: CableApcExtension
   components:
@@ -75226,14 +75218,6 @@ entities:
   - pos: 0.5,4.5
     parent: 130
     type: Transform
-- uid: 7664
-  type: ShellShotgunFlash
-  components:
-  - pos: 1.5967579,19.660324
-    parent: 130
-    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 7665
   type: WallReinforced
   components:
@@ -77007,14 +76991,6 @@ entities:
     type: Physics
   - solution: drink
     type: DrainableSolution
-- uid: 7889
-  type: ShellShotgunFlash
-  components:
-  - pos: 1.3155079,19.691576
-    parent: 130
-    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 7890
   type: DrinkGlass
   components:
@@ -92463,18 +92439,6 @@ entities:
       ballistic-ammo: !type:Container
         ents: []
     type: ContainerContainer
-- uid: 9852
-  type: BoxShotgunFlash
-  components:
-  - pos: -50.401936,33.396786
-    parent: 130
-    type: Transform
-  - canCollide: False
-    type: Physics
-  - containers:
-      storagebase: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 9853
   type: WeaponShotgunKammerer
   components:
@@ -148567,14 +148531,6 @@ entities:
     type: Airtight
   - canCollide: False
     type: Physics
-- uid: 17447
-  type: ShellShotgunFlash
-  components:
-  - pos: 1.7061329,19.660326
-    parent: 130
-    type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 17448
   type: CarpetBlack
   components:

Resources/Maps/splitstation.yml

@@ -190355,18 +190355,6 @@ entities:
   - pos: 48.5,6.5
     parent: 69
     type: Transform
-- uid: 22390
-  type: BoxShotgunFlash
-  components:
-  - pos: 6.6360016,-56.489788
-    parent: 69
-    type: Transform
-  - canCollide: False
-    type: Physics
-  - containers:
-      storagebase: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 22391
   type: DisposalPipe
   components:

Resources/Prototypes/Alerts/alerts.yml

@@ -63,6 +63,7 @@
   name: "[color=red]On Fire[/color]"
   description: "You're [color=red]on fire[/color]. Click the alert to stop, drop and roll to put the fire out or move to a vacuum area."
 
+
 - type: alert
   id: Cold
   category: Temperature
@@ -163,6 +164,17 @@
   name: "[color=yellow]Peckish[/color]"
   description: Some food would be good right about now.
 
+- type: alert
+  id: Stamina
+  category: Stamina
+  icon:
+    sprite: /Textures/Interface/Alerts/stamina.rsi
+    state: stamina
+  name: Stamina
+  description: "Stuns you if it is too low."
+  minSeverity: 0
+  maxSeverity: 6
+
 - type: alert
   id: Starving
   category: Hunger

Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml

@@ -101,17 +101,6 @@
       - id: MagazineMagnum
         amount: 6
 
-- type: entity
-  name: box of .40 Lamia (flash) magazines.
-  parent: BoxCardboard
-  id: BoxMagazineMagnumFlash
-  description: A box full of .40 Lamia (flash) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineMagnumFlash
-        amount: 6
-
 - type: entity
   name: box of .40 Lamia (high-velocity) magazines
   parent: BoxCardboard
@@ -212,17 +201,6 @@
       - id: MagazinePistol
         amount: 6
 
-- type: entity
-  name: box of pistol .35 auto (flash) magazines
-  parent: BoxCardboard
-  id: BoxMagazinePistolFlash
-  description: A box full of pistol .35 auto (flash) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazinePistolFlash
-        amount: 6
-
 - type: entity
   name: box of pistol .35 auto (high-velocity) magazines
   parent: BoxCardboard
@@ -311,17 +289,6 @@
       - id: MagazinePistolSubMachineGun
         amount: 3
 
-- type: entity
-  name: box of SMG .35 auto (flash) magazines
-  parent: BoxCardboard
-  id: BoxMagazinePistolSubMachineGunFlash
-  description: A box full of SMG .35 auto (flash) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazinePistolSubMachineGunFlash
-        amount: 3
-
 - type: entity
   name: box of SMG .35 auto (high-velocity) magazines
   parent: BoxCardboard
@@ -412,17 +379,6 @@
       - id: MagazineRifle
         amount: 6
 
-- type: entity
-  name: box of .20 rifle (flash) magazines
-  parent: BoxCardboard
-  id: BoxMagazineRifleFlash
-  description: A box full of .20 rifle (flash) magazines.
-  components:
-  - type: StorageFill
-    contents:
-      - id: MagazineRifleFlash
-        amount: 6
-
 - type: entity
   name: box of .20 rifle (high-velocity) magazines
   parent: BoxCardboard

Resources/Prototypes/Catalog/Fills/Boxes/security.yml

@@ -133,21 +133,6 @@
         - state: boxwide
         - state: shellflare
 
-- type: entity
-  name: box of shotgun flash cartridges
-  parent: BoxCardboard
-  id: BoxShotgunFlash
-  description: A box full of shotgun flash cartridges, designed for riot shotguns.
-  components:
-    - type: StorageFill
-      contents:
-        - id: ShellShotgunFlash
-          amount: 6
-    - type: Sprite
-      layers:
-        - state: boxwide
-        - state: shellflash
-
 - type: entity
   name: box of shotgun incendiary cartridges
   parent: BoxCardboard
@@ -205,17 +190,6 @@
         - id: MagazineRifle
           amount: 6
 
-- type: entity
-  name: box of .20 rifle (flash) magazines
-  parent: BoxCardboard
-  id: BoxMagazineRifleFlash
-  description: A box full of .20 rifle (flash) magazines.
-  components:
-    - type: StorageFill
-      contents:
-        - id: MagazineRifleFlash
-          amount: 6
-
 - type: entity
   name: box of .20 rifle (high-velocity) magazines
   parent: BoxCardboard

Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml

@@ -4,7 +4,6 @@
   spriteName: ammo
   startingInventory:
     MagazineBoxCaselessRifle: 3
-    MagazineBoxCaselessRifleFlash: 3
     MagazineBoxCaselessRifleHighVelocity: 3
     MagazineBoxCaselessRiflePractice: 3
     MagazineBoxCaselessRifleRubber: 3
@@ -15,19 +14,16 @@
     MagazineBoxLightRifleRubber: 3
 
     MagazineBoxMagnum: 3
-    MagazineBoxMagnumFlash: 3
     MagazineBoxMagnumHighVelocity: 3
     MagazineBoxMagnumPractice: 3
     MagazineBoxMagnumRubber: 3
 
     MagazineBoxPistol: 3
-    MagazineBoxPistolFlash: 3
     MagazineBoxPistolHighVelocity: 3
     MagazineBoxPistolPractice: 3
     MagazineBoxPistolRubber: 3
 
     MagazineBoxRifle: 3
-    MagazineBoxRifleFlash: 3
     MagazineBoxRifleHighVelocity: 3
     MagazineBoxRiflePractice: 3
     MagazineBoxRifleRubber: 3

Resources/Prototypes/Damage/types.yml

@@ -1,28 +1,3 @@
-- type: damageType
-  id: Blunt
-
-- type: damageType
-  id: Slash
-
-- type: damageType
-  id: Piercing
-
-- type: damageType
-  id: Heat
-
-- type: damageType
-  id: Shock
-
-- type: damageType
-  id: Cold
-
-# Poison damage. Generally caused by various reagents being metabolised.
-- type: damageType
-  id: Poison
-
-- type: damageType
-  id: Radiation
-
 # Damage due to being unable to breathe.
 # Represents not enough oxygen (or equivalent) getting to the blood.
 # Usually healed automatically if entity can breathe
@@ -34,9 +9,34 @@
 - type: damageType
   id: Bloodloss
 
+- type: damageType
+  id: Blunt
+
 - type: damageType
   id: Cellular
 
+- type: damageType
+  id: Cold
+
+- type: damageType
+  id: Heat
+
+- type: damageType
+  id: Piercing
+
+# Poison damage. Generally caused by various reagents being metabolised.
+- type: damageType
+  id: Poison
+
+- type: damageType
+  id: Radiation
+
+- type: damageType
+  id: Shock
+
+- type: damageType
+  id: Slash
+
 # Damage represent structures internal integrity.
 # Exclusive for structures such as walls, airlocks and others.
 - type: damageType

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -67,6 +67,7 @@
       types:
         Bloodloss:
           -0.25
+  - type: Stamina
   - type: StatusEffects
     allowed:
     - Stun

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml

@@ -100,21 +100,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifleFlash
-  name: ammunition box (.25 caseless flash)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleFlash
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: flash
-
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRifleHighVelocity

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml

@@ -38,21 +38,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxMagnum
-  id: MagazineBoxMagnumFlash
-  name: ammunition box (.40 magnum flash)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumFlash
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: flash
-
 - type: entity
   parent: BaseMagazineBoxMagnum
   id: MagazineBoxMagnumHighVelocity

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml

@@ -39,21 +39,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxPistol
-  id: MagazineBoxPistolFlash
-  name: ammunition box (.35 auto flash)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolFlash
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: flash
-
 - type: entity
   parent: BaseMagazineBoxPistol
   id: MagazineBoxPistolHighVelocity

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml

@@ -79,21 +79,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  parent: BaseMagazineBoxRifle
-  id: MagazineBoxRifleFlash
-  name: ammunition box (.20 rifle flash)
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeRifleFlash
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-    - state: flash
-
 - type: entity
   parent: BaseMagazineBoxRifle
   id: MagazineBoxRifleHighVelocity

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml

@@ -28,14 +28,6 @@
   - type: CartridgeAmmo
     proto: BulletCaselessRifle
 
-- type: entity
-  id: CartridgeCaselessRifleFlash
-  name: cartridge (.25 caseless flash)
-  parent: BaseCartridgeCaselessRifle
-  components:
-  - type: CartridgeAmmo
-    proto: BulletCaselessRifleFlash
-
 - type: entity
   id: CartridgeCaselessRifleHighVelocity
   name: cartridge (.25 caseless high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml

@@ -27,14 +27,6 @@
   - type: CartridgeAmmo
     proto: BulletLightRifle
 
-- type: entity
-  id: CartridgeLightRifleFlash
-  name: cartridge (.30 rifle flash)
-  parent: BaseCartridgeLightRifle
-  components:
-  - type: CartridgeAmmo
-    proto: BulletLightRifleFlash
-
 - type: entity
   id: CartridgeLightRifleHighVelocity
   name: cartridge (.30 rifle high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml

@@ -27,14 +27,6 @@
   - type: CartridgeAmmo
     proto: BulletMagnum
 
-- type: entity
-  id: CartridgeMagnumFlash
-  name: cartridge (.40 magnum flash)
-  parent: BaseCartridgeMagnum
-  components:
-  - type: CartridgeAmmo
-    proto: BulletMagnumFlash
-
 - type: entity
   id: CartridgeMagnumHighVelocity
   name: cartridge (.40 magnum high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

@@ -27,14 +27,6 @@
   - type: CartridgeAmmo
     proto: BulletPistol
 
-- type: entity
-  id: CartridgePistolFlash
-  name: cartridge (.35 auto flash)
-  parent: BaseCartridgePistol
-  components:
-  - type: CartridgeAmmo
-    proto: BulletPistolFlash
-
 - type: entity
   id: CartridgePistolHighVelocity
   name: cartridge (.35 auto high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml

@@ -27,14 +27,6 @@
   - type: CartridgeAmmo
     proto: BulletRifle
 
-- type: entity
-  id: CartridgeRifleFlash
-  name: cartridge (.20 rifle flash)
-  parent: BaseCartridgeRifle
-  components:
-  - type: CartridgeAmmo
-    proto: BulletRifleFlash
-
 - type: entity
   id: CartridgeRifleHighVelocity
   name: cartridge (.20 rifle high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -80,20 +80,6 @@
   - type: CartridgeAmmo
     proto: PelletShotgun
 
-- type: entity
-  id: ShellShotgunFlash
-  name: shell (.50 flash)
-  parent: BaseShellShotgun
-  components:
-  - type: Sprite
-    layers:
-      - state: flash
-        map: [ "enum.AmmoVisualLayers.Base" ]
-  - type: CartridgeAmmo
-    proto: PelletShotgunFlash
-  - type: SpentAmmoVisuals
-    state: "flash"
-
 - type: entity
   id: ShellShotgunIncendiary
   name: shell (.50 incendiary)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml

@@ -112,8 +112,6 @@
     zeroVisible: false
   - type: Appearance
 
-# No flash
-
 - type: entity
   id: MagazinePistolCaselessRifleHighVelocity
   name: "pistol magazine (.25 caseless high-velocity)"
@@ -245,21 +243,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineCaselessRifleShortFlash
-  name: "short magazine (.25 caseless flash)"
-  parent: BaseMagazineCaselessRifleShort
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleFlash
-    capacity: 20
-  - type: Sprite
-    layers:
-    - state: flash
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineCaselessRifleShortHighVelocity
   name: "short magazine (.25 caseless high-velocity)"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml

@@ -68,20 +68,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineLightRifleFlash
-  name: "magazine (.30 rifle flash)"
-  parent: BaseMagazineLightRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeLightRifleFlash
-  - type: Sprite
-    layers:
-    - state: flash
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineLightRifleHighVelocity
   name: "magazine (.30 rifle high-velocity)"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml

@@ -78,20 +78,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineMagnumFlash
-  name: "Lamia magazine (.40 magnum flash)"
-  parent: BaseMagazineMagnum
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumFlash
-  - type: Sprite
-    layers:
-    - state: flash
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineMagnumHighVelocity
   name: "Lamia magazine (.40 magnum high-velocity)"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml

@@ -159,20 +159,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazinePistolFlash
-  name: pistol magazine (.35 auto flash)
-  parent: BaseMagazinePistol
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolFlash
-  - type: Sprite
-    layers:
-    - state: flash
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazinePistolHighVelocity
   name: pistol magazine (.35 auto high-velocity)
@@ -291,20 +277,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazinePistolSubMachineGunFlash
-  name: SMG magazine (.35 auto flash)
-  parent: BaseMagazinePistolSubMachineGun
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolFlash
-  - type: Sprite
-    layers:
-    - state: flash
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazinePistolSubMachineGunHighVelocity
   name: SMG magazine (.35 auto high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml

@@ -47,20 +47,6 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
 
-- type: entity
-  id: MagazineRifleFlash
-  name: "magazine (.20 rifle flash)"
-  parent: BaseMagazineRifle
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeRifleFlash
-  - type: Sprite
-    layers:
-    - state: flash
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazineRifleHighVelocity
   name: "magazine (.20 rifle high-velocity)"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 19
 
-- type: entity
-  id: BulletCaselessRifleFlash
-  name: bullet (.25 caseless flash)
-  parent: BaseBulletFlash
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 3
-
 - type: entity
   id: BulletCaselessRifleHighVelocity
   name: bullet (.25 caseless high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 19
 
-- type: entity
-  id: BulletLightRifleFlash
-  name: bullet (.20 rifle flash)
-  parent: BaseBulletFlash
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 3
-
 - type: entity
   id: BulletLightRifleHighVelocity
   name: bullet (.20 rifle high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 22
 
-- type: entity
-  id: BulletMagnumFlash
-  name: bullet (.40 magnum flash)
-  parent: BaseBulletFlash
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 3
-
 - type: entity
   id: BulletMagnumHighVelocity
   name: bullet (.40 magnum high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 16
 
-- type: entity
-  id: BulletPistolFlash
-  name: bullet (.35 auto flash)
-  parent: BaseBulletFlash
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 3
-
 - type: entity
   id: BulletPistolHighVelocity
   name: bullet (.35 auto high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml

@@ -9,17 +9,6 @@
       types:
         Piercing: 17
 
-- type: entity
-  id: BulletRifleFlash
-  name: bullet (0.20 rifle flash)
-  parent: BaseBulletFlash
-  noSpawn: true
-  components:
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 3
-
 - type: entity
   id: BulletRifleHighVelocity
   name: bullet (0.20 rifle high-velocity)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

@@ -25,9 +25,8 @@
     damage:
       types:
         Blunt: 10
-  - type: StunOnCollide
-    stunAmount: 5
-    knockdownAmount: 3
+  - type: StaminaDamageOnCollide
+    damage: 55
 
 - type: entity
   id: PelletShotgun
@@ -43,20 +42,6 @@
       types:
         Piercing: 5
 
-- type: entity
-  id: PelletShotgunFlash
-  name: pellet (.50 flash)
-  noSpawn: true
-  parent: BaseBulletFlash
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
-    state: buckshot
-  - type: Projectile
-    damage:
-      types:
-        Blunt: 2
-
 - type: entity
   id: PelletShotgunIncendiary
   name: pellet (.50 incendiary)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml

@@ -32,26 +32,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: SpeedLoaderMagnumFlash
-  name: "speed loader (.40 magnum flash)"
-  parent: BaseSpeedLoaderMagnum
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgeMagnumFlash
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
-    layers:
-      - state: base
-        map: [ "enum.GunVisualLayers.Base" ]
-      - state: flash-6
-        map: [ "enum.GunVisualLayers.Mag" ]
-  - type: MagazineVisuals
-    magState: flash
-    steps: 7
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   id: SpeedLoaderMagnumHighVelocity
   name: "speed loader (.40 magnum high-velocity)"

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml

@@ -32,25 +32,6 @@
     zeroVisible: false
   - type: Appearance
 
-- type: entity
-  id: SpeedLoaderPistolFlash
-  name: "speed loader (.35 auto flash)"
-  parent: BaseSpeedLoaderPistol
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolFlash
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: flash-6
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: flash
-    steps: 7
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   id: SpeedLoaderPistolHighVelocity
   name: "speed loader (.35 auto high-velocity)"

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

@@ -246,11 +246,49 @@
     zeroVisible: true
   - type: Appearance
 
+- type: entity
+  name: disabler
+  parent: BaseWeaponBattery
+  id: WeaponDisabler
+  description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
+  components:
+    - type: Tag
+      tags:
+        - Taser
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/Battery/disabler.rsi
+      layers:
+        - state: base
+          map: ["enum.GunVisualLayers.Base"]
+        - state: mag-unshaded-0
+          map: ["enum.GunVisualLayers.MagUnshaded"]
+          shader: unshaded
+    - type: Clothing
+      sprite: Objects/Weapons/Guns/Battery/disabler.rsi
+      size: 10
+      quickEquip: false
+      Slots:
+        - Belt
+    - type: Gun
+      fireRate: 2
+      soundGunshot:
+        path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+    - type: ProjectileBatteryAmmoProvider
+      proto: BulletDisabler
+      fireCost: 50
+    - type: MagazineVisuals
+      magState: mag
+      steps: 5
+      zeroVisible: true
+    - type: Appearance
+
 - type: entity
   name: taser
   parent: BaseWeaponBattery
   id: WeaponTaser
   description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
+  # Use Disabler
+  suffix: Obsolete
   components:
   - type: Tag
     tags:
@@ -274,11 +312,8 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser.ogg
   - type: ProjectileBatteryAmmoProvider
-    proto: BulletTaser
+    proto: BulletDisabler
     fireCost: 50
-  - type: Battery
-    maxCharge: 100
-    startingCharge: 100
   - type: MagazineVisuals
     magState: mag
     steps: 5

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml

@@ -42,21 +42,6 @@
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: impact_laser
 
-- type: hitscan
-  id: OmniLaser
-  damage:
-    types:
-      Heat: 21
-  muzzleFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: muzzle_omni
-  travelFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: beam_omni
-  impactFlash:
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
-    state: impact_omni
-
 - type: hitscan
   id: XrayLaser
   damage:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -57,21 +57,6 @@
       - Impassable
       - BulletImpassable
 
-- type: entity
-  id: BaseBulletFlash
-  name: base bullet flash
-  parent: BaseBulletTrigger
-  noSpawn: true
-  components:
-  - type: Projectile
-    soundHit:
-      path: /Audio/Weapons/Guns/Hits/snap.ogg
-  - type: FlashOnTrigger
-    range: 1
-  - type: EmitSoundOnTrigger
-    sound:
-      path: "/Audio/Effects/flash_bang.ogg"
-
 - type: entity
   id: BaseBulletHighVelocity
   name: base bullet high-velocity
@@ -106,14 +91,13 @@
         Blunt: 3
     soundHit:
       path: /Audio/Weapons/Guns/Hits/snap.ogg
-  - type: StunOnCollide
-    stunAmount: 2
-    knockdownAmount: 2
+  - type: StaminaDamageOnCollide
+    damage: 15
 
 # Energy projectiles
 - type: entity
-  name : taser bolt
-  id: BulletTaser
+  name : disabler bolt
+  id: BulletDisabler
   parent: BaseBullet
   noSpawn: true
   components:
@@ -123,24 +107,24 @@
       params:
         volume: 5
   - type: Sprite
-    noRot: true
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
-    color: "#ffff33"
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
     layers:
-    - state: spark
+    - state: omnilaser
       shader: unshaded
   - type: Physics
   - type: Fixtures
     fixtures:
     - shape:
         !type:PhysShapeAabb
-        bounds: "-0.2,-0.2,0.2,0.2"
+        bounds: "-0.15,-0.3,0.15,0.3"
       hard: false
       id: projectile
       mask:
       - Impassable
       - BulletImpassable
   - type: Ammo
+  - type: StaminaDamageOnCollide
+    damage: 55
   - type: Projectile
     damage:
       types:
@@ -148,9 +132,6 @@
     soundHit:
       path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg"
     soundForce: true
-  - type: StunOnCollide
-    stunAmount: 5
-    knockdownAmount: 5
 
 - type: entity
   name: emitter bolt
@@ -246,9 +227,8 @@
         Blunt: 1
     soundHit:
       path: /Audio/Effects/gen_hit.ogg
-  - type: StunOnCollide
-    stunAmount: 8
-    knockdownAmount: 8
+  - type: StaminaDamageOnCollide
+    damage: 80
 
 - type: entity
   id: BulletGrenadeBlast
@@ -269,7 +249,7 @@
 - type: entity
   id: BulletGrenadeFlash
   name: flash grenade
-  parent: BaseBulletFlash
+  parent: BaseBulletTrigger
   noSpawn: true
   components:
   - type: Sprite

Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml

@@ -13,9 +13,8 @@
     sound: /Audio/Weapons/bolathrow.ogg
   - type: EmitSoundOnLand
     sound: /Audio/Effects/snap.ogg
-  - type: StunOnCollide
-    stunAmount: 1
-    knockdownAmount: 3
+  - type: StaminaDamageOnCollide
+    damage: 80
   - type: Construction
     graph: Bola
     node: bola

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -16,8 +16,10 @@
     range: 1.5
     arcwidth: 60
     arc: default
-  - type: UseDelay
-    delay: 4
+    cooldownTime: 1.5
+    arcCooldownTime: 1.5
+  - type: StaminaDamageOnHit
+    damage: 55
   - type: Battery
     maxCharge: 1000
     startingCharge: 1000
@@ -50,7 +52,7 @@
       arcWidth: 10
       arc: default
     - type: Item
-      size: 2
+      size: 5
       sprite: Objects/Weapons/Melee/flash.rsi
     - type: ItemCooldown
 

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -170,14 +170,3 @@
     Plastic: 15
     Steel: 10
     Glass: 5
-
-- type: latheRecipe
-  id: ShellShotgunFlash
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-    state: flash
-  result: ShellShotgunFlash
-  completetime: 2
-  materials:
-    Plastic: 20
-    Steel: 5

Resources/Textures/Interface/Alerts/stamina.rsi/meta.json

@@ -0,0 +1,124 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/blob/832ae532766d491d91db53746d15b4b55be3f2b0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+          "name": "stamina6",
+          "delays": [
+            [
+              0.5,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.5
+            ]
+          ]
+        },
+        {
+          "name": "stamina5",
+          "delays": [
+            [
+              0.5,
+              0.2,
+              0.2,
+              0.2,
+              0.2,
+              0.5
+            ]
+          ]
+        },
+        {
+          "name": "stamina4",
+          "delays": [
+            [
+              0.3,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.3
+            ]
+          ]
+        },
+        {
+          "name": "stamina3",
+          "delays": [
+            [
+              0.3,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.3
+            ]
+          ]
+        },
+        {
+          "name": "stamina2",
+          "delays": [
+            [
+              0.3,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.3
+            ]
+          ]
+        },
+        {
+          "name": "stamina1",
+          "delays": [
+            [
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1
+            ]
+          ]
+        },
+        {
+          "name": "stamina0",
+          "delays": [
+            [
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1
+            ]
+          ]
+        }
+      ]
+}

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json

@@ -25,9 +25,6 @@
     {
       "name": "mag10-1"
     },
-    {
-      "name": "flash"
-    },
     {
       "name": "hv"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json

@@ -13,9 +13,6 @@
     {
       "name": "mag-1"
     },
-    {
-      "name": "flash"
-    },
     {
       "name": "hv"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json

@@ -13,9 +13,6 @@
     {
       "name": "mag-1"
     },
-    {
-      "name": "flash"
-    },
     {
       "name": "hv"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json

@@ -19,9 +19,6 @@
     {
       "name": "magb-1"
     },
-    {
-      "name": "flash"
-    },
     {
       "name": "hv"
     },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json

@@ -31,12 +31,6 @@
         {
             "name": "flare-spent"
         },
-        {
-            "name": "flash"
-        },
-        {
-            "name": "flash-spent"
-        },
         {
             "name": "incendiary"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "flash"
-        },
         {
             "name": "high_velocity"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "flash"
-        },
         {
             "name": "high_velocity"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "flash"
-        },
         {
             "name": "high_velocity"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "flash"
-        },
         {
             "name": "high_velocity"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "flash"
-        },
         {
             "name": "high_velocity"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "flash"
-        },
         {
             "name": "high_velocity"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json

@@ -10,9 +10,6 @@
         {
             "name": "base"
         },
-        {
-            "name": "flash"
-        },
         {
             "name": "high_velocity"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json

@@ -28,24 +28,6 @@
         {
             "name": "base-6"
         },
-        {
-            "name": "flash-1"
-        },
-        {
-            "name": "flash-2"
-        },
-        {
-            "name": "flash-3"
-        },
-        {
-            "name": "flash-4"
-        },
-        {
-            "name": "flash-5"
-        },
-        {
-            "name": "flash-6"
-        },
         {
             "name": "high-velocity-1"
         },

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json

@@ -28,24 +28,6 @@
         {
             "name": "base-6"
         },
-        {
-            "name": "flash-1"
-        },
-        {
-            "name": "flash-2"
-        },
-        {
-            "name": "flash-3"
-        },
-        {
-            "name": "flash-4"
-        },
-        {
-            "name": "flash-5"
-        },
-        {
-            "name": "flash-6"
-        },
         {
             "name": "high-velocity-1"
         },

Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "taken from tg station at commithttps://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57",
+  "copyright": "taken from tg station at commit https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57",
   "size": {
     "x": 32,
     "y": 32