New Guns (hopefully no conflicts this time) (#5105)

* New Guns (hopefully conflict free)

* solving conflicts

* forgot to delete old laser gun png

* Revert "forgot to delete old laser gun png"

This reverts commit 6273aff7a411f24484fdbde0757446ab7ab5f873.

* small corrections

* carbine

* uplink correction

* cog meta.json correction

* replace laser pistol

* svalinn inhands

* getting rid of my old lasergun

* forgot to delete the old lasergun from yml

* Revert "getting rid of my old lasergun"

This reverts commit 763caefd64f1497da5ff6ac5239e3c64b0a892c2.

* Revert "forgot to delete the old lasergun from yml"

This reverts commit 144f4533c44d29e56e5356389d498a437180fa1e.

* base.png and taser fire cost corrections

* last changes for this PR. the c20 and predator sprites. and corrected meta.json

* lowercased

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

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -54,6 +54,18 @@
         amount: 2
 #     - id: SMGSuppressor
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateAmmo
+  id: ClothingBackpackDuffelSyndicateFilledRevolver
+  name: Predator bundle
+  description: "Go loud and proud with a fully loaded Magnum Predator, bundled with two speed loaders." 
+  components:
+  - type: StorageFill
+    contents:
+      - id: RevolverPredator
+      - id: SLMagnum
+        amount: 2
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateFilledLMG
@@ -83,6 +95,24 @@
   - type: Storage
     capacity: 200
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateAmmo
+  id: ClothingBackpackDuffelSyndicateFilledCarbine
+  name: Z8 Bulldog bundle
+  description: "A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities."
+  components:
+  - type: StorageFill
+    contents:
+      - id: RifleCarbine
+      - id: MagazineSRifle
+        amount: 2
+      - id: GrenadeBlast
+        amount: 2
+      - id: GrenadeFlash
+        amount: 2
+      - id: GrenadeFrag
+        amount: 2
+
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelSyndicateCostumeCentcom

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -9,11 +9,11 @@
   price: 6
 
 - type: uplinkListing
-  id: UplinkRevolverInspector
+  id: UplinkRevolverPredator
   category: Weapons
-  itemId: RevolverInspector
+  itemId: RevolverPredator
-  listingName: Inspector
+  listingName: Predator
-  description: A .40 magnum caliber revolver. Still quite deadly, despite its ancient design.
+  description: A loud and deadly revolver. Uses .40 Magnum.
   price: 8
 
 # Inbuilt suppressor so it's sneaky + more expensive.
@@ -137,6 +137,13 @@
   price: 25
   icon: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/icon.png
 
+- type: uplinkListing
+  id: UplinkCarbineBundle
+  category: Bundles
+  itemId: ClothingBackpackDuffelSyndicateFilledCarbine
+  price: 35
+  icon: /Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/icon.png
+
 # Tools
 
 - type: uplinkListing

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

@@ -28,6 +28,7 @@
     fireRate: 2
     powerCellPrototype: PowerCellSmallStandard
     powerCellRemovable: true
+    fireCost: 40
     ammoPrototype: RedLaser
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser.ogg
@@ -42,6 +43,141 @@
       steps: 5
       zeroVisible: true
 
+- type: entity
+  name: makeshift laser gun
+  parent: BaseItem
+  id: MakeshiftLaser
+  description: Better pray it won't burn your hands off.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/makeshift.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/makeshift.rsi
+  - type: RangedWeapon
+  - type: BatteryBarrel
+    currentSelector: Single
+    allSelectors:
+    - Single
+    fireRate: 2
+    minAngle: 0
+    maxAngle: 45
+    angleIncrease: 15
+    angleDecay: 45
+    powerCellPrototype: PowerCellSmallStandard
+    powerCellRemovable: true
+    fireCost: 40
+    ammoPrototype: RedLaser
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+    soundPowerCellInsert:
+      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+    soundPowerCellEject:
+      path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 5
+      zeroVisible: false
+
+- type: entity
+  name: svalinn laser pistol
+  parent: BaseItem
+  id: LaserPistolSvalinn
+  description: A cheap and widely used laser pistol.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/svalinn.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/svalinn.rsi
+  - type: RangedWeapon
+  - type: BatteryBarrel
+    currentSelector: Single
+    allSelectors:
+    - Single
+    fireRate: 2
+    minAngle: 0
+    maxAngle: 45
+    angleIncrease: 15
+    angleDecay: 45
+    powerCellPrototype: PowerCellSmallStandard
+    powerCellRemovable: true
+    fireCost: 20
+    ammoPrototype: RedLaser
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+    soundPowerCellInsert:
+      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+    soundPowerCellEject:
+      path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 5
+      zeroVisible: false
+
+- type: entity
+  name: cog laser carbine
+  parent: BaseItem
+  id: LaserRifleCog
+  description: Favoured by Nanotrasen Security for being cheap and easy to use.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/cog.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/cog.rsi
+  - type: RangedWeapon
+  - type: BatteryBarrel
+    currentSelector: Single
+    allSelectors:
+    - Single
+    fireRate: 2
+    minAngle: 0
+    maxAngle: 45
+    angleIncrease: 15
+    angleDecay: 45
+    powerCellPrototype: PowerCellSmallStandard
+    powerCellRemovable: true
+    fireCost: 10
+    ammoPrototype: RedLaser
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+    soundPowerCellInsert:
+      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+    soundPowerCellEject:
+      path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 5
+      zeroVisible: false
+
 - type: entity
   name: laser cannon
   parent: BaseItem
@@ -72,6 +208,7 @@
     angleDecay: 45
     powerCellPrototype: PowerCellSmallSuper
     powerCellRemovable: true
+    fireCost: 600
     ammoPrototype: RedHeavyLaser
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
@@ -168,6 +305,7 @@
     angleDecay: 15
     powerCellPrototype: PowerCellSmallStandard
     powerCellRemovable: false
+    fireCost: 80
     ammoPrototype: BulletTaser
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/taser.ogg
@@ -186,7 +324,7 @@
   name: laser gun
   parent: BaseItem
   id: LaserSecGun
-  description: Standard issued laser carbine for Nanotrasen security operatives.
+  description: A laser gun.
   components:
   - type: Sprite
     netsync: false

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

@@ -55,7 +55,7 @@
   name: Inspector
   parent: RevolverBase
   id: RevolverInspector
-  description: A high caliber revolver. Still quite deadly, despite its ancient design.
+  description: A detective's best friend.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
@@ -69,7 +69,7 @@
     - Single
     fillPrototype: CartridgeMagnum
     caliber: Magnum
-    capacity: 7
+    capacity: 6
     soundEmpty:
       path: /Audio/Weapons/Guns/Empty/empty.ogg
     soundGunshot:
@@ -106,3 +106,31 @@
       path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+
+- type: entity
+  name: Predator
+  parent: RevolverBase
+  id: RevolverPredator
+  description: A robust revolver favoured by Syndicate agents.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Revolvers/predator.rsi
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Revolvers/predator.rsi
+  - type: RangedWeapon
+  - type: RevolverBarrel
+    currentSelector: Single
+    allSelectors:
+    - Single
+    fillPrototype: CartridgeMagnum
+    caliber: Magnum
+    capacity: 7
+    soundEmpty:
+      path: /Audio/Weapons/Guns/Empty/empty.ogg
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/revolver.ogg
+    soundEject:
+      path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg

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

@@ -127,7 +127,7 @@
   name: Z8 Bulldog
   parent: RifleBase
   id: RifleCarbine
-  description: An older bullpup carbine model, made by Frozen Star.
+  description: An older bullpup carbine model, with an attached underbarrel grenade launcher.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Rifles/carbine.rsi

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

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

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

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

@@ -0,0 +1,22 @@
+{
+    "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/sky_driver.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.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/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/guns/projectile/cr20.dmi",
+  "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