Beam Devastator (RPG Replacement) and Beam Cannon (research) (#2231)

* meow

* meow

* meow

* bea,m

* silly

* Meow

* Bean

* meow

* Meow

* Revert "Meow"

This reverts commit 404b428.

* meow

* meow

* meow

* Meow

* Meow

* Meow

* Meow

* Meow

* meow

* Requested changes

* Meow

* Should be everything

* Add flavor text

* Im sorry delta

---------

Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>

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

@@ -261,3 +261,71 @@
     steps: 5
     zeroVisible: true
   - type: Appearance
+
+- type: entity
+  parent: [ BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband ]
+  id: WeaponBeamCannon
+  name: beam cannon
+  description: "For when a single shot just isn't enough"
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/beam_cannon.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-0
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/beam_cannon.rsi
+  - type: Gun
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/beamcannon.ogg
+    selectedMode: FullAuto
+    fireRate: 15
+    availableModes: FullAuto
+  - type: Battery
+    maxCharge: 3000
+    startingCharge: 3000
+  - type: HitscanBatteryAmmoProvider
+    proto: BeamLaser
+    fireCost: 10
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+
+- type: entity
+  parent: BaseWeaponBattery
+  id: WeaponBeamDevestator
+  name: beam devastator
+  description: A powerful energy weapon that fires multiple rapid laser beams per second
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MultiHandedItem
+  - type: ClothingSpeedModifier
+    walkModifier: 0.7
+    sprintModifier: 0.7
+  - type: HeldSpeedModifier
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Battery/beam_devestator.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Gun
+    selectedMode: FullAuto
+    fireRate: 15
+    availableModes: FullAuto
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/beamcannon.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: BeamDev
+    fireCost: 600
+  - type: Battery
+    maxCharge: 300000
+    startingCharge: 300000
+  - type: Tag
+    tags:
+    - PowerCage

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

@@ -13,3 +13,34 @@
   impactFlash:
     sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
     state: impact_omni
+
+- type: hitscan
+  id: BeamLaser
+  damage:
+    types:
+      Heat: 2
+  muzzleFlash:
+    sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: muzzle_laser
+  travelFlash:
+    sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: beam
+  impactFlash:
+    sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: impact_laser
+
+- type: hitscan
+  id: BeamDev
+  damage:
+    types:
+      Heat: 5
+      Structural: 20
+  muzzleFlash:
+    sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: muzzle_laser
+  travelFlash:
+    sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: beam
+  impactFlash:
+    sprite: DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: impact_laser

Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml

@@ -224,3 +224,13 @@
     Steel: 1000
     Plastic: 800
 
+- type: latheRecipe
+  parent: BaseWeaponRecipeLong
+  id: WeaponBeamCannon
+  result: WeaponBeamCannon
+  materials:
+    Steel: 2000
+    Glass: 1000
+    Plastic: 500
+    Gold: 250
+    Plasma: 500

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -439,6 +439,7 @@
       - AdvancedTruncheon
       - LauncherSyringe
       - MiniSyringe
+      - WeaponBeamCannon
       # End DeltaV additions
 
 - type: entity
@@ -893,6 +894,7 @@
       - ClothingOuterHardsuitSyndieReverseEngineered
       - ClothingShoesBootsSecurityMagboots
       - AdvancedTruncheon
+      - WeaponBeamCannon
       # End DeltaV additions
   - type: MaterialStorage
     whitelist:

Resources/Prototypes/Entities/Structures/Power/chargers.yml

@@ -128,19 +128,21 @@
     color: "#03fc4e"
     energy: 0.7
   - type: Charger
-    chargeRate: 50
+    chargeRate: 400 # DeltaV - Raised from 50 to 400
   - type: Sprite
     sprite: Structures/Power/cage_recharger.rsi
-  - type: PowerCellSlot
-    cellSlotId: charger_slot
-  - type: ItemSlots
+  - type: ItemSlots # DeltaV - Removed PowerCellSlot
     slots:
       charger_slot:
         ejectOnInteract: true
-        name: Power cage
         whitelist:
           tags:
           - PowerCage
+          components:
+          - HitscanBatteryAmmoProvider # DeltaV - allows hitscan guns to be charged
+        blacklist:
+          tags:
+          - PowerCell
   - type: Machine
     board: PowerCageRechargerCircuitboard
   - type: StaticPrice

Resources/Prototypes/Research/arsenal.yml

@@ -159,6 +159,7 @@
   recipeUnlocks:
   - WeaponLaserCannon
   - WeaponXrayCannon
+  - WeaponBeamCannon # DeltaV - Adds Beam cannon
 
 # DeltaV: merged with concentrated laser weaponry
 #- type: technology

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/beam_cannon.rsi/meta.json

@@ -0,0 +1,62 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, Edited for DeltaV by Stop_Sign",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/beam_devestator.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by TheShuEd (github) for Space Station 14, Edited by Stop_Sign and Lyndomen for DeltaV",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi/meta.json

@@ -5,7 +5,7 @@
   "size": {
     "x": 32,
     "y": 32
-	},
+  },
 	"states": [
 		{
 			"name": "icon"

Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json

@@ -0,0 +1,59 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "muzzle_laser",
+      "delays": [
+        [
+          0.01,
+          0.01,
+          0.01,
+          0.02,
+          0.03,
+          0.02,
+          0.02,
+          0.02,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "beam",
+      "delays": [
+        [
+          0.01,
+          0.01,
+          0.01,
+          0.02,
+          0.03,
+          0.02,
+          0.02,
+          0.02,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "impact_laser",
+      "delays": [
+        [
+          0.01,
+          0.01,
+          0.01,
+          0.02,
+          0.03,
+          0.02,
+          0.02,
+          0.02,
+          0.2
+        ]
+      ]
+    }
+  ]
+}