Merge branch 'weapons'

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

@@ -0,0 +1,81 @@
+- type: entity
+  name: Mk32 "Universal"
+  parent: [BaseWeaponPistol, BaseC1Contraband]
+  id: WeaponPistolUniversal
+  description: The Mark 32 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .45 magnum ammo. # DeltaV - update Mk32
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi
+  - type: Gun
+    fireRate: 3
+    availableModes:
+    - SemiAuto
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistol
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistol
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistol
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+
+- type: entity
+  name: pollock
+  parent: [BaseWeaponPistol, BaseC1Contraband]
+  id: WeaponPistolPollock
+  description: A compact and mass-produced combat pistol. Uses .35 auto ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
+  - type: Gun
+    fireRate: 5
+    availableModes:
+    - SemiAuto
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistol
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistol
+            - MagazinePistolHighCapacity
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistol
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: StaticPrice
+    price: 500

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

@@ -0,0 +1,67 @@
+- type: entity
+  name: fitz special
+  parent: [BaseWeaponRevolver, BaseC1Contraband]
+  id: WeaponRevolverFitz
+  description: A compact and concealable self defence snub revolver. Uses .38 special ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi
+  - type: Gun
+    selectedMode: SemiAuto
+    fireRate: 1.75
+    availableModes:
+    - SemiAuto
+  - type: RevolverAmmoProvider
+    proto: CartridgeMagnum
+    capacity: 6
+    chambers: [ True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null ]
+  - type: StaticPrice
+    price: 340
+
+- type: entity
+  name: faith
+  parent: [BaseWeaponRevolver, BaseC1Contraband]
+  id: WeaponRevolverFaith
+  description: Delivers blessings in bullet form. Uses .38 special ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi
+  - type: Gun
+    selectedMode: SemiAuto
+    fireRate: 1.5
+    availableModes:
+    - SemiAuto
+  - type: RevolverAmmoProvider
+    proto: CartridgeMagnum
+    capacity: 4
+    chambers: [ True, True, True, True ]
+    ammoSlots: [ null, null, null, null ]
+  - type: StaticPrice
+    price: 240
+
+- type: entity
+  name: lucky 37
+  parent: [BaseWeaponRevolver, BaseC1Contraband]
+  id: WeaponRevolverLucky
+  description: Luck always beats skill, ya weasel. Uses .38 special ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi
+  - type: Gun
+    selectedMode: SemiAuto
+    fireRate: 2
+    availableModes:
+    - SemiAuto
+    proto: CartridgeMagnum
+    capacity: 6
+    chambers: [ True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null ]
+  - type: StaticPrice
+    price: 750

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

@@ -0,0 +1,141 @@
+- type: entity
+  name: vulcan
+  parent: [BaseWeaponRifle, BaseGunWieldable]
+  id: WeaponRifleVulcan
+  description: One of the heaviest small arms to grace Security's armory, this rifle is a modern take on a classic, informally dubbed the "Right Arm of the Free World". Uses .30 rifle ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -30
+  - type: Gun
+    minAngle: 21
+    maxAngle: 54
+    angleIncrease: 6
+    angleDecay: 24
+    fireRate: 5
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineLightRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineLightRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeLightRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeLightRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
+  - type: StaticPrice
+    price: 1300
+
+- type: entity
+  name: ceremonial rifle
+  parent: [BaseWeaponSniper, BaseC2ExpeditionContraband]
+  id: WeaponSniperCeremonial
+  description: A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg
+  - type: BallisticAmmoProvider
+    capacity: 5
+    proto: CartridgeLightRifle
+    whitelist:
+      tags:
+      - CartridgeLightRifle
+
+
+- type: entity
+  name: CAWS-25 Jackdaw
+  parent: [BaseWeaponRifle, BaseGunWieldable, BaseC3Contraband]
+  id: WeaponRifleJackdaw
+  description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
+  components:
+  - type: Item
+    size: Large
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Gun
+    minAngle: 2
+    maxAngle: 6
+    angleIncrease: 2
+    angleDecay: 8
+    fireRate: 8
+    selectedMode: FullAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineCaselessRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineCaselessRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeCaselessRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeCaselessRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi

Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml

@@ -8,6 +8,10 @@
     WeaponRifleNovaliteC1: 1 
     WeaponShotgunDoubleBarreled: 1
     WeaponRevolverArgenti: 1 
+    WeaponPistolPollock: 3
+    WeaponRifleVulcan: 3
+    WeaponRevolverFitz: 3
+    WeaponRevolverFaith: 3
     BoxShotgunSlug: 1
     BoxLethalshot: 1
     BoxBeanbag: 1
@@ -35,6 +39,10 @@
     WeaponRifleNovaliteC1: 4294967295
     WeaponShotgunDoubleBarreled: 4294967295
     WeaponRevolverArgenti: 4294967295
+    WeaponPistolPollock: 4294967295
+    WeaponRifleVulcan: 4294967295
+    WeaponRevolverFitz: 4294967295
+    WeaponRevolverFaith: 4294967295
     BoxShotgunSlug: 4294967295
     BoxLethalshot: 4294967295
     BoxBeanbag: 4294967295

Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml

@@ -59,6 +59,8 @@
     #- WeaponCaseLongShotgunDoubleBarreledExpedition
     - WeaponCaseShortSawnExpedition
     - WeaponCaseLongMosinExpedition
+    - WeaponSniperCeremonial
+    - WeaponRevolverLucky
     chance: 1.0
     offset: 0.0
     rarePrototypes:
@@ -325,6 +327,7 @@
     - WeaponCaseHeavyAsmgtExpeditions
     - WeaponCaseLongEnforcerExpedition
     - WeaponCaseLongLaserCannonExpedition
+    - WeaponRifleJackdaw # Corvax-Frontier
     chance: 1.0
     offset: 0.0
     rarePrototypes:

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

@@ -669,6 +669,7 @@
     ## Weapons
       - CombatKnife
       - WeaponLaserSvalinn # After the changes made to windows shouldn't be that much of an issue now if it's widely available
+      - WeaponPistolPollock
       - WeaponLaserPistolNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available
       - WeaponRevolverArgenti
       - WeaponPistolMk58NF

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

@@ -124,3 +124,13 @@
     Glass: 5
     Plasma: 10
     Silver: 5
+
+- type: latheRecipe
+  id: WeaponPistolPollock
+  result: WeaponPistolPollock
+  category: Weapons
+  completetime: 3
+  materials:
+    Steel: 1000
+    Plastic: 1200
+    Plasteel: 1200

Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+	  {
+		  "name": "icon"
+	  },
+	  {
+		  "name": "base"
+	  },
+	  {
+		  "name": "mag-0"
+	  },
+	  {
+		  "name": "bolt-open"
+	  },
+	  {
+		  "name": "inhand-left",
+		  "directions": 4
+	  },
+	  {
+		  "name": "inhand-right",
+		  "directions": 4
+	  },
+      {
+        "name": "equipped-BELT",
+        "directions": 4
+      }
+    ]
+}