Proto-kinetic accelerator

Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs

@@ -36,7 +36,7 @@ public override void Update(float frameTime)
             recharge.AccumulatedFrameTime += frameTime;
 
             if (recharge.AccumulatedFrameTime < recharge.NextRechargeTime)
-                return;
+                continue;
 
             recharge.AccumulatedFrameTime -= recharge.NextRechargeTime;
             UpdateCooldown(recharge);

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

@@ -1,5 +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
+taser2.ogg and kinetic_accel.ogg were taken from https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac
 It is licensed under CC-BY-SA 3.0

Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

@@ -16,3 +16,4 @@
       - id: ClothingBeltUtilityFilled
         prob: 0.8
       - id: SurvivalKnife
+      - id: WeaponProtoKineticAccelerator

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

@@ -0,0 +1,33 @@
+- type: entity
+  id: WeaponProtoKineticAcceleratorBase
+  abstract: true
+  parent: BaseItem
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+  - type: Item
+    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+    size: 30
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg
+  - type: AmmoCounter
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.AmmoVisuals.HasAmmo:
+        overlay:
+          True: { visible: False }
+          False: { visible: True }
+  - type: RechargeBasicEntityAmmo
+    minRechargeCooldown: 3
+    maxRechargeCooldown: 5
+    rechargeSound:
+      path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg
+  - type: BasicEntityAmmoProvider
+    proto: BulletKinetic
+    capacity: 1

Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/base_staff.yml → Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml

@@ -4,9 +4,9 @@
   parent: BaseItem
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Magic/staves.rsi
+    sprite: Objects/Weapons/Guns/Basic/staves.rsi
   - type: Item
-    sprite: Objects/Weapons/Guns/Magic/staves.rsi
+    sprite: Objects/Weapons/Guns/Basic/staves.rsi
     HeldPrefix: staff
     size: 60
   - type: Gun

Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/base_wand.yml → Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml

@@ -4,9 +4,9 @@
   parent: BaseItem
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Magic/wands.rsi
+    sprite: Objects/Weapons/Guns/Basic/wands.rsi
   - type: Item
-    sprite: Objects/Weapons/Guns/Magic/wands.rsi
+    sprite: Objects/Weapons/Guns/Basic/wands.rsi
     HeldPrefix: wand
     size: 30
   - type: Gun

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

@@ -0,0 +1,13 @@
+- type: entity
+  name: proto-kinetic accelerator
+  id: WeaponProtoKineticAccelerator
+  parent: WeaponProtoKineticAcceleratorBase
+  description: Fires low-damage kinetic bolts at a short range.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
+    layers:
+    - state: gun
+    - state: empty
+      visible: false
+      map: [ "overlay" ]

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

@@ -30,3 +30,18 @@
           state: impact_laser_blue
     - type: EffectVisuals
 
+- type: entity
+  id: BulletImpactEffectKinetic
+  noSpawn: true
+  components:
+  - type: TimedDespawn
+    lifetime: 0.2
+  - type: Sprite
+    netsync: false
+    drawdepth: Effects
+    layers:
+    - shader: unshaded
+      map: ["enum.EffectLayers.Unshaded"]
+      sprite: Effects/arcs.rsi
+      state: punch
+  - type: EffectVisuals

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

@@ -99,3 +99,15 @@
       types:
         Piercing: 300
     ignoreResistances: true
+
+- type: entity
+  id: BulletKinetic
+  name: kinetic bolt
+  parent: BaseBulletHighVelocity
+  noSpawn: true
+  description: Not too bad, but you still don't want to get hit by it.
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 10

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

@@ -186,6 +186,29 @@
     tags:
     - EmitterBolt
 
+- type: entity
+  id: BulletKinetic
+  name: kinetic bolt
+  parent: BaseBulletHighVelocity
+  noSpawn: true
+  description: Not too bad, but you still don't want to get hit by it.
+  components:
+  - type: Sprite
+    netsync: false
+    noRot: false
+    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
+    layers:
+    - state: chronobolt
+      shader: unshaded
+  - type: Projectile
+    impactEffect: BulletImpactEffectKinetic
+    damage:
+      types:
+        Blunt: 10
+  # Short lifespan
+  - type: TimedDespawn
+    lifetime: 0.4
+
 # Launcher projectiles (grenade / rocket)
 - type: entity
   id: BulletRocket

Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "gun"
+    },
+    {
+      "name": "empty",
+      "delays": [
+        [
+          0.2,
+          0.2
+        ]
+      ]
+    },
+	{
+	  "name": "inhand-right",
+	  "directions": 4
+	},
+	{
+	  "name": "inhand-left",
+	  "directions": 4
+	}
+  ]
+}