Arsenal expansion

Resources/Audio/DeltaV/license.txt

@@ -1 +1,4 @@
 typewriter.ogg is modified from https://www.freesoundslibrary.com/typewriter-sound/ which is licensed under the CC BY 4.0 License. This modified file follows the same license.
+axiom.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.
+jackdaw.ogg is modified from atreides.ogg which was taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons which is licensed under the CC-BY-SA 3.0 License. This modified file follows the same license.
+universal.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license.

Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml

@@ -17,7 +17,7 @@
     contents:
       - id: WeaponPistolUniversal
         amount: 2
-      - id: MagazineUniversalCaselessRifle
+      - id: MagazineUniversalMagnum
         amount: 4
 
 - type: entity

Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml

@@ -7,7 +7,7 @@
     contents:
     - id: WeaponPistolUniversal
       amount: 2
-    - id: MagazineUniversalCaselessRifle
+    - id: MagazineUniversalMagnum
       amount: 4
 
 - type: entity

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

@@ -7,6 +7,43 @@
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi
+  - 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: entity
+  name: Pollock
+  parent: BaseWeaponPistol
+  id: WeaponPistolPollock
+  description: A compact and mass-produced combat pistol. Uses .35 auto ammo.
+  suffix: Mercenary
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
   - type: ItemSlots
     slots:
       gun_magazine:

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

@@ -2,7 +2,7 @@
   name: vulcan
   parent: BaseWeaponRifle
   id: WeaponRifleVulcan
-  description: One of the first firearms modified for space usage, this rifle has been used to punch holes in Cargonian "combat mechs."
+  description: One of the first firearms modified for space usage, this rifle has been used to punch holes in Cargonian "combat mechs." Uses .30 rifle ammo.
   components:
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
@@ -46,4 +46,130 @@
   - type: Appearance
   - type: Clothing
     sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
-
+
+- type: entity
+  name: CAWS-25 Jackdaw
+  parent: BaseWeaponRifle
+  id: WeaponRifleJackdaw
+  description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
+  suffix: Deathsquad
+  components:
+  - type: Item
+    size: 30
+  - 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
+
+- type: entity
+  name: Tenebra
+  parent: BaseWeaponRifle
+  id: WeaponRifleTenebra
+  description: A mass-produced and minimalist rifle in bullpup design. Uses .20 rifle ammo.
+  suffix: Mercenary
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Gun
+    minAngle: 3
+    maxAngle: 12
+    angleIncrease: 3
+    angleDecay: 12
+    fireRate: 5
+    selectedMode: FullAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeRifle
+  - 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/tenebra.rsi
+
+- type: entity
+  name: M-90
+  id: WeaponRifleM90
+  parent: WeaponRifleM90GrenadeLauncher
+  description: An older bullpup carbine model. Uses .20 rifle ammo.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi
+  - type: Clothing
+    sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi

Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml

@@ -13,52 +13,52 @@
         - state: shellslug
 
 - type: entity
-  name: box of .25 caseless Universal magazines
-  parent: BoxCardboard
-  id: BoxMagazineUniversalCaselessRifle
-  description: A box full of .25 caseless magazines.
+  name: box of .45 magnum Universal magazines
+  parent: BoxMagazine
+  id: BoxMagazineUniversalMagnum
+  description: A box full of .45 magnum magazines.
   components:
   - type: StorageFill
     contents:
-      - id: MagazineUniversalCaselessRifle
+      - id: MagazineUniversalMagnum
         amount: 6
 
 - type: entity
-  name: box of .25 caseless Universal (high-velocity) magazines
-  parent: BoxCardboard
-  id: BoxMagazineUniversalCaselessRifleHighVelocity
-  description: A box full of .25 caseless high-velocity magazines.
+  name: box of .45 magnum Universal (high-velocity) magazines
+  parent: BoxMagazine
+  id: BoxMagazineUniversalMagnumHighVelocity
+  description: A box full of .45 magnum high-velocity magazines.
   components:
   - type: StorageFill
     contents:
-      - id: MagazineUniversalCaselessRifleHighVelocity
+      - id: MagazineUniversalMagnumHighVelocity
         amount: 6
 
 - type: entity
-  name: box of .25 caseless Universal (practice) magazines
-  parent: BoxCardboard
-  id: BoxMagazineUniversalCaselessRiflePractice
-  description: A box full of .25 caseless practice magazines.
+  name: box of .45 magnum Universal (practice) magazines
+  parent: BoxMagazine
+  id: BoxMagazineUniversalMagnumPractice
+  description: A box full of .45 magnum practice magazines.
   components:
   - type: StorageFill
     contents:
-      - id: MagazineUniversalCaselessRiflePractice
+      - id: MagazineUniversalMagnumPractice
         amount: 6
 
 - type: entity
-  name: box of .25 caseless Universal (rubber) magazines
-  parent: BoxCardboard
-  id: BoxMagazineUniversalCaselessRifleRubber
-  description: A box full of .25 caseless rubber magazines.
+  name: box of .45 magnum Universal (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineUniversalMagnumRubber
+  description: A box full of .45 magnum rubber magazines.
   components:
   - type: StorageFill
     contents:
-      - id: MagazineUniversalCaselessRifleRubber
+      - id: MagazineUniversalMagnumRubber
         amount: 6
 
 - type: entity
   name: box of .30 rifle speed loaders
-  parent: BoxCardboard
+  parent: BoxMagazine
   id: BoxSpeedLoaderLightRifle
   description: A box full of .30 rifle speed loaders.
   components:

Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/caseless_rifle.yml → Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml

@@ -1,22 +1,22 @@
 - type: entity
-  id: BaseMagazineUniversalCaselessRifle
-  name: "Universal magazine (.25 caseless)"
-  parent: BaseMagazineCaselessRifle
+  id: BaseMagazineUniversalMagnum
+  name: "Universal magazine (.45 magnum)"
+  parent: BaseMagazinePistol
   abstract: true
   components:
   - type: Tag
     tags:
-      - MagazineUniversalCaselessRifle
+      - MagazineUniversalMagnum
   - type: BallisticAmmoProvider
     whitelist:
       tags:
-        - CartridgeCaselessRifle
-    proto: CartridgeCaselessRifle
+        - CartridgeMagnum
+    proto: CartridgeMagnum
     capacity: 12
   - type: Item
     size: 5
   - type: Sprite
-    sprite: Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi
+    sprite: Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -31,12 +31,12 @@
 # Magazines for the Universal Pistol
 
 - type: entity
-  id: MagazineUniversalCaselessRifle
-  name: "Universal magazine (.25 caseless)"
-  parent: BaseMagazineUniversalCaselessRifle
+  id: MagazineUniversalMagnum
+  name: "Universal magazine (.45 magnum)"
+  parent: BaseMagazineUniversalMagnum
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifle
+    proto: CartridgeMagnum
     capacity: 12
   - type: Sprite
     layers:
@@ -50,12 +50,12 @@
     zeroVisible: false
 
 - type: entity
-  id: MagazineUniversalCaselessRifleHighVelocity
-  name: "Universal magazine (.25 caseless high-velocity)"
-  parent: BaseMagazineUniversalCaselessRifle
+  id: MagazineUniversalMagnumHighVelocity
+  name: "Universal magazine (.45 magnum high-velocity)"
+  parent: BaseMagazineUniversalMagnum
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleHighVelocity
+    proto: CartridgeMagnumHighVelocity
     capacity: 12
   - type: Sprite
     layers:
@@ -69,12 +69,12 @@
     zeroVisible: false
 
 - type: entity
-  id: MagazineUniversalCaselessRiflePractice
-  name: "Universal magazine (.25 caseless practice)"
-  parent: BaseMagazineUniversalCaselessRifle
+  id: MagazineUniversalMagnumPractice
+  name: "Universal magazine (.45 magnum practice)"
+  parent: BaseMagazineUniversalMagnum
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRiflePractice
+    proto: CartridgeMagnumPractice
     capacity: 12
   - type: Sprite
     layers:
@@ -88,12 +88,12 @@
     zeroVisible: false
 
 - type: entity
-  id: MagazineUniversalCaselessRifleRubber
-  name: "Universal magazine (.25 caseless rubber)"
-  parent: BaseMagazineUniversalCaselessRifle
+  id: MagazineUniversalMagnumRubber
+  name: "Universal magazine (.45 magnum rubber)"
+  parent: BaseMagazineUniversalMagnum
   components:
   - type: BallisticAmmoProvider
-    proto: CartridgeCaselessRifleRubber
+    proto: CartridgeMagnumRubber
     capacity: 12
   - type: Sprite
     layers: