New battery guns and some resprites (#6295)

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>

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

@@ -99,6 +99,36 @@
   - type: BatteryBarrel
     fireCost: 25
 
+- type: entity
+  name: PDW-10 pulse pistol
+  parent: BatteryGunBase
+  id: PulsePistolPdw
+  description: A state of the art energy pistol favoured as a sidearm by the NT-ERT operatives.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
+  - type: BatteryBarrel
+    fireCost: 25
+    ammoPrototype: Pulse
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: PowerCellSlot
+    cellSlot:
+      ejectOnUse: true
+      soundOptions: 
+        volume: -2
+      startingItem: PowerCellSmallHigh
+
 - type: entity
   name: cog laser carbine
   parent: BatteryGunBase
@@ -120,6 +150,36 @@
   - type: BatteryBarrel
     fireCost: 12
 
+- type: entity
+  name: DEAC-12 pulse carbine
+  parent: BatteryGunBase
+  id: PulseCarbineDeac
+  description: A high tech energy carbine favoured by the NT-ERT operatives.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi
+  - type: BatteryBarrel
+    fireCost: 12
+    ammoPrototype: Pulse
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: PowerCellSlot
+    cellSlot:
+      ejectOnUse: true
+      soundOptions: 
+        volume: -2
+      startingItem: PowerCellSmallHigh
+
 - type: entity
   name: laser cannon
   parent: BatteryGunBase
@@ -139,7 +199,7 @@
     size: 24
     sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
   - type: BatteryBarrel
-    fireCost: 600
+    fireCost: 200
     ammoPrototype: RedHeavyLaser
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg

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

@@ -189,20 +189,22 @@
   name: lamia
   parent: PistolBase
   id: PistolLamia
-  description: A heavy pistol of Ironhammer enforcers.
+  description: A heavy pistol chambered in .40 Magnum.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+    sprite: Objects/Weapons/Guns/Pistols/lamia.rsi
     layers:
     - state: base
       map: ["enum.RangedBarrelVisualLayers.Base"]
+    - state: bolt-closed
+      map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
   - type: Icon
-    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+    sprite: Objects/Weapons/Guns/Pistols/lamia.rsi
   - type: Item
     size: 12
-    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+    sprite: Objects/Weapons/Guns/Pistols/lamia.rsi
   - type: RangedWeapon
   - type: MagazineBarrel
     caliber: Magnum
@@ -210,7 +212,7 @@
     - Pistol
     magFillPrototype: MagazineMagnum
     autoEjectMag: true
-    fireRate: 5
+    fireRate: 3
     minAngle: 0
     maxAngle: 45
     angleIncrease: 20
@@ -227,6 +229,7 @@
       path: /Audio/Weapons/Guns/MagOut/hpistol_magout.ogg
   - type: Appearance
     visuals:
+    - type: BarrelBoltVisualizer
     - type: MagVisualizer
       magState: mag
       steps: 1
@@ -360,6 +363,36 @@
     angleIncrease: 20
     angleDecay: 60
 
+- type: entity
+  name: basilisk
+  parent: PistolBase
+  id: PistolBasilisk
+  description: A fully automatic handgun chambered in .40 magnum. Can use both pistol and SMG type magazines.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+  - type: Item
+    size: 12
+    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
+  - type: RangedWeapon
+  - type: MagazineBarrel
+    caliber: Magnum
+    currentSelector: Automatic
+    allSelectors:
+    - Automatic
+    magazineTypes:
+    - Pistol
+    - Smg
+    magFillPrototype: MagazineMagnum
+    autoEjectMag: true
+    fireRate: 6
+    minAngle: 0
+    maxAngle: 45
+    angleIncrease: 20
+    angleDecay: 60
+
 - type: entity
   name: olivaw
   parent: PistolBase

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

@@ -11,6 +11,19 @@
     muzzleFlash: Objects/Weapons/Guns/Projectiles/laser_muzzle.png
     impactFlash: Objects/Weapons/Guns/Projectiles/laser_impact.png
 
+- type: entity
+  name: pulse
+  id: Pulse
+  abstract: true
+  components:
+  - type: Hitscan
+    damage:
+      types:
+        Heat: 25
+    spriteName: Objects/Weapons/Guns/Projectiles/pulse.png
+    muzzleFlash: Objects/Weapons/Guns/Projectiles/pulse_muzzle.png
+    impactFlash: Objects/Weapons/Guns/Projectiles/pulse_impact.png
+
 - type: entity
   name: red heavy laser
   id: RedHeavyLaser

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

@@ -48,6 +48,8 @@
     layers:
       - state: base
         map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: bolt-closed
+        map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
   - type: Icon
@@ -75,6 +77,7 @@
       path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
   - type: Appearance
     visuals:
+    - type: BarrelBoltVisualizer
     - type: MagVisualizer
       magState: mag
       steps: 1
@@ -91,6 +94,8 @@
     layers:
       - state: base
         map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: bolt-closed
+        map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
   - type: Icon
@@ -118,6 +123,7 @@
       path: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
   - type: Appearance
     visuals:
+    - type: BarrelBoltVisualizer
     - type: MagVisualizer
       magState: mag
       steps: 1

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

@@ -0,0 +1,40 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/cassad.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "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
+        }
+    ]
+}

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

@@ -0,0 +1,40 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/pdw.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "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
+        }
+    ]
+}

Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json

@@ -6,23 +6,29 @@
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+       {
+         "name": "icon"
+       },
+       {
+         "name": "base"
+       },
+       {
+         "name": "bolt-closed"
+       },
+       {
+          "name": "bolt-open"
+       },
+       {
+          "name": "mag-0"
+       },
+       {
+          "name": "inhand-left",
+          "directions": 4
+       },
+       {
+          "name": "inhand-right",
+          "directions": 4
+       }
+    ]
 }

Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json

@@ -1,43 +1,36 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/projectile/lamia.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base"
-    },
-    {
-      "name": "base-unshaded"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "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
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "bolt-open"
+
+        },
+        {
+            "name": "bolt-closed"
+
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }

Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/molly.dmi",
+  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/molly.dmi",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
+  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,12 @@
     {
       "name": "base"
     },
+    {
+      "name": "bolt-closed"
+    },
+    {
+      "name": "bolt-open"
+    },
     {
       "name": "mag-0"
     },

Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
+  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,12 @@
     {
       "name": "base"
     },
+    {
+      "name": "bolt-closed"
+    },
+    {
+      "name": "bolt-open"
+    },
     {
       "name": "mag-0"
     },

Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/carabine.dmi",
+  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/carabine.dmi",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/meta.json

@@ -1,34 +1,34 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/projectile/kovacs.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base"
-    },
-    {
-      "name": "bolt-closed"
-    },
-    {
-      "name": "bolt-open"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-closed"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }

Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json

@@ -1,37 +1,37 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41804/commits/1baf679a544505960cebd071425f1df60669cdf3",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base"
-    },
-    {
-      "name": "bolt-closed"
-    },
-    {
-      "name": "bolt-open"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "suppressor"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-closed"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "suppressor"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }