From 96afb3f7692622b6716a7160f80f7541b5406bb2 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 19 May 2024 00:32:21 +0300 Subject: [PATCH 01/10] Rubber --- .../VendingMachines/Inventories/ammo.yml | 4 +- .../Guns/Ammunition/Boxes/caseless_rifle.yml | 36 ++++++++ .../Guns/Ammunition/Boxes/light_rifle.yml | 17 +++- .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 15 ++++ .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 36 ++++++++ .../Ammunition/Cartridges/caseless_rifle.yml | 15 ++++ .../Ammunition/Cartridges/light_rifle.yml | 15 ++++ .../Guns/Ammunition/Cartridges/magnum.yml | 15 ++++ .../Guns/Ammunition/Cartridges/pistol.yml | 15 ++++ .../Guns/Ammunition/Cartridges/rifle.yml | 16 ++++ .../Ammunition/Magazines/caseless_rifle.yml | 49 +++++++++++ .../Guns/Ammunition/Magazines/light_rifle.yml | 14 ++++ .../Guns/Ammunition/Magazines/magnum.yml | 28 +++++++ .../Guns/Ammunition/Magazines/rifle.yml | 14 ++++ .../Ammunition/Projectiles/caseless_rifle.yml | 11 +++ .../Ammunition/Projectiles/light_rifle.yml | 11 +++ .../Guns/Ammunition/Projectiles/magnum.yml | 15 +++- .../Guns/Ammunition/Projectiles/pistol.yml | 11 +++ .../Guns/Ammunition/Projectiles/rifle.yml | 15 +++- .../Guns/Ammunition/SpeedLoaders/magnum.yml | 20 +++++ .../Guns/Ammunition/SpeedLoaders/pistol.yml | 19 +++++ .../Weapons/Guns/Projectiles/projectiles.yml | 19 +++++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 25 ++++++ .../Objects/Weapons/Guns/SMGs/smgs.yml | 56 ++++++++++++- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 8 +- .../_NF/Catalog/Fills/Boxes/ammunition.yml | 70 ++++++++++++++++ .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 14 ++++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 48 +++++++++++ Resources/migration.yml | 84 +++++++++---------- 29 files changed, 661 insertions(+), 54 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 447e2037996..ca04fdf9163 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -7,7 +7,7 @@ WeaponSniperRepeater: 10 MagazineBoxLightRifle: 10 MagazineBoxLightRiflePractice: 10 -# MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber + MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber WeaponShotgunDoubleBarreled: 10 BoxShotgunSlug: 10 BoxLethalshot: 10 @@ -15,7 +15,7 @@ BoxShotgunPractice: 10 WeaponRevolverArgenti: 10 MagazineBoxRifle: 10 -# MagazineBoxRifleRubber: 15 # Frontier - TODO: Restore Rubber + MagazineBoxRifleRubber: 15 # Frontier - TODO: Restore Rubber MagazineBoxRiflePractice: 10 MagazineBoxMagnum: 10 emaggedInventory: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 98ad35b70d2..063268d8b53 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -65,6 +65,27 @@ zeroVisible: false - type: Appearance +- type: entity + parent: BaseMagazineBoxCaselessRifle + id: MagazineBoxCaselessRifleBigRubber + name: ammunition box (.25 caseless rubber) + components: + - type: BallisticAmmoProvider + capacity: 200 + proto: CartridgeCaselessRifleRubber + - type: Sprite + layers: + - state: base-b + map: ["enum.GunVisualLayers.Base"] + - state: magb-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber-b + - type: MagazineVisuals + magState: magb + steps: 2 + zeroVisible: false + - type: Appearance + - type: entity parent: BaseMagazineBoxCaselessRifle id: MagazineBoxCaselessRifle @@ -93,3 +114,18 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: practice + +- type: entity + parent: BaseMagazineBoxCaselessRifle + id: MagazineBoxCaselessRifleRubber + name: ammunition box (.25 caseless rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index d5fb4360a82..bdb4054dfab 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -74,6 +74,21 @@ map: ["enum.GunVisualLayers.Mag"] - state: practice +- type: entity + parent: BaseMagazineBoxLightRifle + id: MagazineBoxLightRifleRubber + name: ammunition box (.30 rifle rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber + - type: entity id: MagazineBoxLightRifleIncendiary parent: BaseMagazineBoxLightRifle @@ -102,4 +117,4 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - state: uranium + - state: uranium \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 018d812e3f5..26fc8c10fc8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -53,6 +53,21 @@ map: ["enum.GunVisualLayers.Mag"] - state: practice +- type: entity + parent: BaseMagazineBoxMagnum + id: MagazineBoxMagnumRubber + name: ammunition box (.45 magnum rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber + - type: entity id: MagazineBoxMagnumIncendiary parent: BaseMagazineBoxMagnum diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index 7a5f5d27ca6..05fe960fcbf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -44,6 +44,27 @@ zeroVisible: false - type: Appearance +- type: entity + parent: BaseMagazineBoxRifle + id: MagazineBoxRifleBigRubber + name: ammunition box (.20 rifle rubber) + components: + - type: BallisticAmmoProvider + capacity: 200 + proto: CartridgeRiflePractice + - type: Sprite + layers: + - state: base-b + map: ["enum.GunVisualLayers.Base"] + - state: magb-1 + map: ["enum.GunVisualLayers.Mag"] + - state: practice-b + - type: MagazineVisuals + magState: magb + steps: 2 + zeroVisible: false + - type: Appearance + - type: entity parent: BaseMagazineBoxRifle id: MagazineBoxRifle @@ -73,6 +94,21 @@ map: ["enum.GunVisualLayers.Mag"] - state: practice +- type: entity + parent: BaseMagazineBoxRifle + id: MagazineBoxRifleRubber + name: ammunition box (.20 rifle rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber + - type: entity id: MagazineBoxRifleIncendiary parent: BaseMagazineBoxRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index a35a42d8c2a..e62c9b40c24 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -43,3 +43,18 @@ - state: tip map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" + +- type: entity + id: CartridgeCaselessRifleRubber + name: cartridge (.25 caseless rubber) + parent: BaseCartridgeCaselessRifle + components: + - type: CartridgeAmmo + proto: BulletCaselessRifleRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 554b96f80bd..34940b1a970 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -43,6 +43,21 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" +- type: entity + id: CartridgeLightRifleRubber + name: cartridge (.30 rifle rubber) + parent: BaseCartridgeLightRifle + components: + - type: CartridgeAmmo + proto: BulletLightRifleRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" + - type: entity id: CartridgeLightRifleIncendiary name: cartridge (.30 rifle incendiary) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 95e98b7f45b..932d3b9a1f0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -43,6 +43,21 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" +- type: entity + id: CartridgeMagnumRubber + name: cartridge (.45 magnum rubber) + parent: BaseCartridgeMagnum + components: + - type: CartridgeAmmo + proto: BulletMagnumRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" + - type: entity id: CartridgeMagnumIncendiary name: cartridge (.45 magnum incendiary) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index b5cb5db1ec9..b49beb85e63 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -43,6 +43,21 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" +- type: entity + id: CartridgePistolRubber + name: cartridge (.35 auto rubber) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: BulletPistolRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" + - type: entity id: CartridgePistolIncendiary name: cartridge (.35 auto incendiary) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index fbd7c568c0e..b7146bc1272 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -43,6 +43,22 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" + +- type: entity + id: CartridgeRifleRubber + name: cartridge (.20 rifle rubber) + parent: BaseCartridgeRifle + components: + - type: CartridgeAmmo + proto: BulletRifleRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" + - type: entity id: CartridgeRifleIncendiary name: cartridge (.20 rifle incendiary) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index 2c23d803e2d..0d16f1e966c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -132,6 +132,26 @@ zeroVisible: false - type: Appearance +- type: entity + id: MagazinePistolCaselessRifleRubber + name: "pistol magazine (.25 caseless rubber)" + parent: BaseMagazinePistolCaselessRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifleRubber + capacity: 10 + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 6 + zeroVisible: false + - type: Appearance + - type: entity id: MagazineCaselessRifle name: "magazine (.25 caseless)" @@ -160,6 +180,20 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazineCaselessRifleRubber + name: "magazine (.25 caseless rubber)" + parent: BaseMagazineCaselessRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineCaselessRifleShort name: "short magazine (.25 caseless)" @@ -189,3 +223,18 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineCaselessRifleShortRubber + name: "short magazine (.25 caseless rubber)" + parent: BaseMagazineCaselessRifleShort + components: + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifleRubber + capacity: 20 + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index e7b0a803b70..a703b60e58a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -95,6 +95,20 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazineLightRifleRubber + name: "magazine (.30 rifle rubber)" + parent: BaseMagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineLightRifleUranium name: "magazine (.30 rifle uranium)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 304014d11b4..fc506ec594a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -88,6 +88,20 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazineMagnumRubber + name: pistol magazine (.45 magnum rubber) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineMagnumUranium name: pistol magazine (.45 magnum uranium) @@ -157,6 +171,20 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazineMagnumSubMachineGunRubber + name: "Vector magazine (.45 magnum rubber)" + parent: BaseMagazineMagnumSubMachineGun + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineMagnumSubMachineGunUranium name: "Vector magazine (.45 magnum uranium)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index b2148ba1b2d..7d8aeb93463 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -82,6 +82,20 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazineRifleRubber + name: "magazine (.20 rifle rubber)" + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineRifleUranium name: "magazine (.20 rifle uranium)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 741f0a4e1a0..5ce0bf82fe9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -19,3 +19,14 @@ damage: types: Blunt: 2 + +- type: entity + id: BulletCaselessRifleRubber + name: bullet (.25 caseless rubber) + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index c6a4808b77b..3a0df2ac6c7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -20,6 +20,17 @@ types: Blunt: 2 +- type: entity + id: BulletLightRifleRubber + name: bullet (.20 rifle rubber) + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 + - type: entity id: BulletLightRifleIncendiary parent: BaseBulletIncendiary diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index 798de9fa853..1b5cf7890ba 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -20,6 +20,19 @@ types: Blunt: 1 +- type: entity + id: BulletMagnumRubber + name: bullet (.45 magnum rubber) + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 + - type: StaminaDamageOnCollide + damage: 35 # 3 hits to stun cuz revolver + - type: entity id: BulletMagnumIncendiary parent: BaseBulletIncendiary @@ -31,7 +44,7 @@ types: Blunt: 3 Heat: 32 - + - type: entity id: BulletMagnumAP name: bullet (.45 magnum armor-piercing) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 3cfcc0cf206..086a8dc914f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -20,6 +20,17 @@ types: Blunt: 2 +- type: entity + id: BulletPistolRubber + name: bullet (.35 auto rubber) + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 + - type: entity id: BulletPistolIncendiary parent: BaseBulletIncendiary diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 6f6fa0f9077..2113916cf52 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -20,6 +20,17 @@ types: Blunt: 2 +- type: entity + id: BulletRifleRubber + name: bullet (0.20 rifle rubber) + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 + - type: entity id: BulletRifleIncendiary parent: BaseBulletIncendiary @@ -31,7 +42,7 @@ types: Blunt: 2 Heat: 15 - + - type: entity id: BulletRifleUranium parent: BaseBulletUranium @@ -43,4 +54,4 @@ types: Radiation: 7 Piercing: 8 - + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml index 08d50db9b2c..d8e2c908b6f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -80,6 +80,26 @@ zeroVisible: false - type: Appearance +- type: entity + id: SpeedLoaderMagnumRubber + name: "speed loader (.45 magnum rubber)" + parent: BaseSpeedLoaderMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: rubber-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: rubber + steps: 7 + zeroVisible: false + - type: Appearance + - type: entity id: SpeedLoaderMagnumAP name: "speed loader (.45 magnum armor-piercing)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml index 3ce419b2c3c..1fef25f16fa 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -57,3 +57,22 @@ steps: 7 zeroVisible: false - type: Appearance + +- type: entity + id: SpeedLoaderPistolRubber + name: "speed loader (.35 auto rubber)" + parent: BaseSpeedLoaderPistol + components: + - type: BallisticAmmoProvider + proto: CartridgePistolRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: rubber-6 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: rubber + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 60121fde792..7f9ce36f2bd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -104,6 +104,25 @@ types: Blunt: 1 +- type: entity + id: BaseBulletRubber + name: base bullet rubber + parent: BaseBullet + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: rubber + - type: Projectile + damage: + types: + Blunt: 3 + soundHit: + path: /Audio/Weapons/Guns/Hits/snap.ogg + - type: StaminaDamageOnCollide + damage: 22 # 5 hits to stun sounds reasonable + - type: entity id: BaseBulletIncendiary name: base bullet incendiary diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index ef83e6c5722..0e7f1a62272 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -186,3 +186,28 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: Lecter + parent: WeaponRifleLecter + id: WeaponRifleLecterRubber + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifleRubber + 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: CartridgeRifleRubber + priority: 1 + whitelist: + tags: + - CartridgeRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 45be47f79c0..3986c1cb7dc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -20,7 +20,7 @@ maxAngle: 16 fireRate: 8 angleIncrease: 3 - angleDecay: 16 + angleDecay: 16 selectedMode: FullAuto availableModes: - SemiAuto @@ -231,7 +231,7 @@ minAngle: 1 maxAngle: 6 angleIncrease: 1.5 - angleDecay: 6 + angleDecay: 6 selectedMode: FullAuto shotsPerBurst: 5 availableModes: @@ -261,3 +261,55 @@ steps: 6 zeroVisible: true - type: Appearance + +# Rubber +- type: entity + name: Drozd + parent: WeaponSubMachineGunDrozd + id: WeaponSubMachineGunDrozdRubber + suffix: Non-Lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolSubMachineGunRubber + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolSubMachineGun + gun_chamber: + name: Chamber + startingItem: CartridgePistolRubber + priority: 1 + whitelist: + tags: + - CartridgePistol + +- type: entity + name: Vector + parent: WeaponSubMachineGunVector + id: WeaponSubMachineGunVectorRubber + description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. + suffix: Non-Lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineMagnumSubMachineGunRubber + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineMagnumSubMachineGun + gun_chamber: + name: Chamber + startingItem: CartridgeMagnumRubber + priority: 1 + whitelist: + tags: + - CartridgeMagnum diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 3a9383dbd18..3baafe4dd11 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -29,7 +29,7 @@ id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984 + pocket1: WeaponPistolN1984Nonlethal pocket2: FlashlightSeclite - type: startingGear @@ -46,7 +46,7 @@ id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984 + pocket1: WeaponPistolN1984Nonlethal pocket2: FlashlightSeclite - type: startingGear @@ -205,7 +205,7 @@ id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58 + pocket1: WeaponPistolMk58Nonlethal pocket2: FlashlightSeclite - type: startingGear @@ -222,7 +222,7 @@ id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolMk58 + pocket1: WeaponPistolMk58Nonlethal pocket2: FlashlightSeclite - type: startingGear diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml new file mode 100644 index 00000000000..d0f3352a820 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml @@ -0,0 +1,70 @@ +# As opposed to MagazineBox these are boxes of magazines so BoxMagazine +# CaselessRifle +- type: entity + name: box of .25 caseless (rubber) magazines + parent: BoxMagazine + id: BoxMagazineCaselessRifleRubber + description: A box full of + components: + - type: StorageFill + contents: + - id: MagazineCaselessRifleRubber + amount: 4 + +# LightRifle +- type: entity + name: box of .30 rifle (rubber) magazines + parent: BoxMagazine + id: BoxMagazineLightRifleRubber + description: A box full of .30 rifle (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineLightRifleRubber + amount: 4 + +- type: entity + name: box of Vector (rubber) magazines + parent: BoxMagazine + id: BoxMagazineMagnumSubMachineGunRubber + description: A box full of Vector (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumSubMachineGunRubber + amount: 3 + +# Pistol +- type: entity + name: box of pistol .35 auto (rubber) magazines + parent: BoxMagazine + id: BoxMagazinePistolRubber + description: A box full of pistol .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolRubber + amount: 4 + +- type: entity + name: box of SMG .35 auto (rubber) magazines + parent: BoxMagazine + id: BoxMagazinePistolSubMachineGunRubber + description: A box full of SMG .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunRubber + amount: 3 + +# Rifle +- type: entity + name: box of .20 rifle (rubber) magazines + parent: BoxMagazine + id: BoxMagazineRifleRubber + description: A box full of .20 rifle (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineRifleRubber + amount: 4 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml new file mode 100644 index 00000000000..5b3aba79f09 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -0,0 +1,14 @@ +- type: entity + parent: BaseMagazineBoxPistol + id: MagazineBoxPistolRubber + name: ammunition box (.35 auto rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgePistolRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml new file mode 100644 index 00000000000..c7e61a2dc14 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -0,0 +1,48 @@ +- type: entity + id: WeaponPistolMk58Nonlethal + parent: WeaponPistolMk58 + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolRubber + 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: CartridgePistolRubber + priority: 1 + whitelist: + tags: + - CartridgePistol + +- type: entity + name: N1984 + parent: WeaponPistolN1984 + id: WeaponPistolN1984Nonlethal + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineMagnumRubber + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineMagnum + gun_chamber: + name: Chamber + startingItem: CartridgeMagnumRubber + priority: 1 + whitelist: + tags: + - CartridgeMagnum diff --git a/Resources/migration.yml b/Resources/migration.yml index 374bf3f6262..2e5418294be 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -299,48 +299,48 @@ BodyBag_Container: BodyBag BodyBag_Folded: BodyBagFolded # 2024-04-26 -BaseBulletRubber: null -BulletPistolRubber: BulletPistol -BulletMagnumRubber: BulletMagnum -BulletLightRifleRubber: BulletLightRifle -BulletRifleRubber: BulletRifle -BulletCaselessRifleRubber: BulletCaselessRifle -CartridgePistolRubber: CartridgePistol -CartridgeMagnumRubber: CartridgeMagnum -CartridgeLightRifleRubber: CartridgeLightRifle -CartridgeRifleRubber: CartridgeRifle -CartridgeCaselessRifleRubber: CartridgeCaselessRifle -MagazinePistolRubber: MagazinePistol -MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun -MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle -MagazineMagnumRubber: MagazineMagnum -MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun -MagazineLightRifleRubber: MagazineLightRifle -MagazineRifleRubber: MagazineRifle -MagazineCaselessRifleRubber: MagazineCaselessRifle -MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort -SpeedLoaderPistolRubber: SpeedLoaderPistol -SpeedLoaderMagnumRubber: SpeedLoaderMagnum -MagazineBoxPistolRubber: MagazineBoxPistol -# RIP box of magnum rubbers 202X to 2024 -MagazineBoxMagnumRubber: MagazineBoxMagnum -MagazineBoxLightRifleRubber: MagazineBoxLightRifle -MagazineBoxRifleRubber: MagazineBoxRifle -MagazineBoxRifleBigRubber: MagazineBoxRifleBig -MagazineBoxCaselessRifleRubber: MagazineBoxCaselessRifle -MagazineBoxCaselessRifleBigRubber: MagazineBoxCaselessRifle10x24 -BoxMagazinePistolRubber: BoxMagazinePistol -BoxMagazinePistolHighCapacityRubber: BoxMagazinePistolHighCapacity -BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun -BoxMagazineLightRifleRubber: BoxMagazineLightRifle -BoxMagazineRifleRubber: BoxMagazineRifle -BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle -BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun -WeaponPistolMk58Nonlethal: WeaponPistolMk58 -WeaponPistolN1984Nonlethal: WeaponPistolN1984 -WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector -WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd -WeaponRifleLecterRubber: WeaponRifleLecter +# BaseBulletRubber: null +# BulletPistolRubber: BulletPistol +# BulletMagnumRubber: BulletMagnum +# BulletLightRifleRubber: BulletLightRifle +# BulletRifleRubber: BulletRifle +# BulletCaselessRifleRubber: BulletCaselessRifle +# CartridgePistolRubber: CartridgePistol +# CartridgeMagnumRubber: CartridgeMagnum +# CartridgeLightRifleRubber: CartridgeLightRifle +# CartridgeRifleRubber: CartridgeRifle +# CartridgeCaselessRifleRubber: CartridgeCaselessRifle +# MagazinePistolRubber: MagazinePistol +# MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun +# MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle +# MagazineMagnumRubber: MagazineMagnum +# MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun +# MagazineLightRifleRubber: MagazineLightRifle +# MagazineRifleRubber: MagazineRifle +# MagazineCaselessRifleRubber: MagazineCaselessRifle +# MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort +# SpeedLoaderPistolRubber: SpeedLoaderPistol +# SpeedLoaderMagnumRubber: SpeedLoaderMagnum +# MagazineBoxPistolRubber: MagazineBoxPistol +# # RIP box of magnum rubbers 202X to 2024 +# MagazineBoxMagnumRubber: MagazineBoxMagnum +# MagazineBoxLightRifleRubber: MagazineBoxLightRifle +# MagazineBoxRifleRubber: MagazineBoxRifle +# MagazineBoxRifleBigRubber: MagazineBoxRifleBig +# MagazineBoxCaselessRifleRubber: MagazineBoxCaselessRifle +# MagazineBoxCaselessRifleBigRubber: MagazineBoxCaselessRifle10x24 +# BoxMagazinePistolRubber: BoxMagazinePistol +# BoxMagazinePistolHighCapacityRubber: BoxMagazinePistolHighCapacity +# BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun +# BoxMagazineLightRifleRubber: BoxMagazineLightRifle +# BoxMagazineRifleRubber: BoxMagazineRifle +# BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle +# BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun +# WeaponPistolMk58Nonlethal: WeaponPistolMk58 +# WeaponPistolN1984Nonlethal: WeaponPistolN1984 +# WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector +# WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd +# WeaponRifleLecterRubber: WeaponRifleLecter # 2024-04-26 GlassBoxLaserBroken: GlassBoxBroken From 1dd48b3ca4385bf6082894fb500bf66e4b1e67f8 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 19 May 2024 00:45:42 +0300 Subject: [PATCH 02/10] Fix --- .../VendingMachines/Inventories/ammo.yml | 4 +- .../_NF/Catalog/Fills/Lockers/guns.yml | 126 +++++++++--------- .../Inventories/lesslethalvend.yml | 16 +-- .../Objects/Weapons/Guns/Guns/snipers.yml | 22 +-- 4 files changed, 84 insertions(+), 84 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index ca04fdf9163..e0454b7626a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -7,7 +7,7 @@ WeaponSniperRepeater: 10 MagazineBoxLightRifle: 10 MagazineBoxLightRiflePractice: 10 - MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber + MagazineBoxLightRifleRubber: 15 WeaponShotgunDoubleBarreled: 10 BoxShotgunSlug: 10 BoxLethalshot: 10 @@ -15,7 +15,7 @@ BoxShotgunPractice: 10 WeaponRevolverArgenti: 10 MagazineBoxRifle: 10 - MagazineBoxRifleRubber: 15 # Frontier - TODO: Restore Rubber + MagazineBoxRifleRubber: 15 MagazineBoxRiflePractice: 10 MagazineBoxMagnum: 10 emaggedInventory: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml index b3eb7f240a0..5ba572fe688 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml @@ -26,15 +26,15 @@ - id: ShuttleWeaponRevolverArgenti orGroup: T1-1 prob: 0.1 -# - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber -# orGroup: T1-1 -# prob: 0.1 + - id: ShuttleWeaponRevolverArgentiNonlethal + orGroup: T1-1 + prob: 0.1 - id: ShuttleWeaponSniperMosin orGroup: T1-1 prob: 0.1 -# - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber -# orGroup: T1-1 -# prob: 0.1 + - id: ShuttleKardashev-MosinNonlethal + orGroup: T1-1 + prob: 0.1 # T1-2 - id: ShuttleWeaponLaserGun orGroup: T1-2 @@ -45,15 +45,15 @@ - id: ShuttleWeaponRevolverArgenti orGroup: T1-2 prob: 0.1 -# - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber -# orGroup: T1-2 -# prob: 0.1 + - id: ShuttleWeaponRevolverArgentiNonlethal + orGroup: T1-2 + prob: 0.1 - id: ShuttleWeaponSniperMosin orGroup: T1-2 prob: 0.1 -# - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber -# orGroup: T1-2 -# prob: 0.1 + - id: ShuttleKardashev-MosinNonlethal + orGroup: T1-2 + prob: 0.1 # T1 Melee - id: BaseBallBat orGroup: Melee @@ -90,15 +90,15 @@ - id: ShuttleWeaponRevolverArgenti orGroup: T1-1 prob: 0.1 -# - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber -# orGroup: T1-1 -# prob: 0.1 + - id: ShuttleWeaponRevolverArgentiNonlethal + orGroup: T1-1 + prob: 0.1 - id: ShuttleWeaponSniperMosin orGroup: T1-1 prob: 0.1 -# - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber -# orGroup: T1-1 -# prob: 0.1 + - id: ShuttleKardashev-MosinNonlethal + orGroup: T1-1 + prob: 0.1 # T1-2 - id: ShuttleWeaponLaserGun orGroup: T1-2 @@ -109,40 +109,40 @@ - id: ShuttleWeaponRevolverArgenti orGroup: T1-2 prob: 0.1 -# - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber -# orGroup: T1-2 -# prob: 0.1 + - id: ShuttleWeaponRevolverArgentiNonlethal + orGroup: T1-2 + prob: 0.1 - id: ShuttleWeaponSniperMosin orGroup: T1-2 prob: 0.1 -# - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber -# orGroup: T1-2 -# prob: 0.1 + - id: ShuttleKardashev-MosinNonlethal + orGroup: T1-2 + prob: 0.1 # T2-1 - id: ShuttleWeaponPistolMk58 orGroup: T2-1 prob: 0.1 -# - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-1 -# prob: 0.1 + - id: ShuttleWeaponPistolMk58Nonlethal + orGroup: T2-1 + prob: 0.1 - id: ShuttleWeaponRevolverDeckard orGroup: T2-1 prob: 0.1 -# - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-1 -# prob: 0.1 + - id: ShuttleWeaponRevolverDeckardNonlethal + orGroup: T2-1 + prob: 0.1 - id: ShuttleWeaponShotgunDoubleBarreled orGroup: T2-1 prob: 0.1 -# - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber -# orGroup: T2-1 -# prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreledRubber + orGroup: T2-1 + prob: 0.1 - id: ShuttleWeaponShotgunSawn orGroup: T2-1 prob: 0.1 -# - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-1 -# prob: 0.1 + - id: ShuttleWeaponShotgunSawnNonlethal + orGroup: T2-1 + prob: 0.1 # T2 Melee - id: SpearReinforced orGroup: Melee @@ -167,52 +167,52 @@ - id: ShuttleWeaponPistolMk58 orGroup: T2-1 prob: 0.1 -# - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-1 -# prob: 0.1 + - id: ShuttleWeaponPistolMk58Nonlethal + orGroup: T2-1 + prob: 0.1 - id: ShuttleWeaponRevolverDeckard orGroup: T2-1 prob: 0.1 -# - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-1 -# prob: 0.1 + - id: ShuttleWeaponRevolverDeckardNonlethal + orGroup: T2-1 + prob: 0.1 - id: ShuttleWeaponShotgunDoubleBarreled orGroup: T2-1 prob: 0.1 -# - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber -# orGroup: T2-1 -# prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreledRubber + orGroup: T2-1 + prob: 0.1 - id: ShuttleWeaponShotgunSawn orGroup: T2-1 prob: 0.1 -# - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-1 -# prob: 0.1 + - id: ShuttleWeaponShotgunSawnNonlethal + orGroup: T2-1 + prob: 0.1 # T2-2 - id: ShuttleWeaponPistolMk58 orGroup: T2-2 prob: 0.1 -# - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-2 -# prob: 0.1 + - id: ShuttleWeaponPistolMk58Nonlethal + orGroup: T2-2 + prob: 0.1 - id: ShuttleWeaponRevolverDeckard orGroup: T2-2 prob: 0.1 -# - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-2 -# prob: 0.1 + - id: ShuttleWeaponRevolverDeckardNonlethal + orGroup: T2-2 + prob: 0.1 - id: ShuttleWeaponShotgunDoubleBarreled orGroup: T2-2 prob: 0.1 -# - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber -# orGroup: T2-2 -# prob: 0.1 + - id: ShuttleWeaponShotgunDoubleBarreledRubber + orGroup: T2-2 + prob: 0.1 - id: ShuttleWeaponShotgunSawn orGroup: T2-2 prob: 0.1 -# - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber -# orGroup: T2-2 -# prob: 0.1 + - id: ShuttleWeaponShotgunSawnNonlethal + orGroup: T2-2 + prob: 0.1 # T3-1 - id: ShuttleWeaponEnergyGun orGroup: T3-1 @@ -220,9 +220,9 @@ - id: ShuttleWeaponShotgunKammerer orGroup: T3-1 prob: 0.1 -# - id: ShuttleWeaponShotgunKammererNonlethal # Frontier - TODO: Restore rubber -# orGroup: T3-1 -# prob: 0.1 + - id: ShuttleWeaponShotgunKammererNonlethal + orGroup: T3-1 + prob: 0.1 # T3 Melee - id: KukriKnife orGroup: Melee diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 1167ce4c3cc..fa67a4a6923 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -2,18 +2,18 @@ id: LessLethalVendInventory startingInventory: WeaponDisabler: 10 - # Kardashev-MosinNonlethal: 10 # Frontier - TODO: Restore Rubber - # WeaponRevolverArgentiNonlethal: 10 # Frontier - TODO: Restore Rubber - # WeaponShotgunDoubleBarreledRubber: 10 # Frontier - TODO: Restore Rubber + Kardashev-MosinNonlethal: 10 + WeaponRevolverArgentiNonlethal: 10 + WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 - # MagazineBoxPistolRubber: 10 # Frontier - TODO: Restore Rubber - # MagazineBoxMagnumRubber: 10 # Frontier - TODO: Restore Rubber + MagazineBoxPistolRubber: 10 + MagazineBoxMagnumRubber: 10 BoxBeanbag: 8 - # MagazineBoxRifleRubber: 8 # Frontier - TODO: Restore Rubber - # MagazineBoxLightRifleRubber: 4 # Frontier - TODO: Restore Rubber - # MagazineBoxCaselessRifleRubber: 4 # Frontier - TODO: Restore Rubber + MagazineBoxRifleRubber: 8 + MagazineBoxLightRifleRubber: 4 + MagazineBoxCaselessRifleRubber: 4 contrabandInventory: WeaponRifleBB: 2 BoxCartridgeBB: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index 128b1c91a6a..e0375a3e51a 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -1,11 +1,11 @@ -# - type: entity # Frontier - TODO: Restore Rubber - # id: Kardashev-MosinNonlethal - # parent: WeaponSniperMosin - # suffix: Non-lethal - # components: - # - type: BallisticAmmoProvider - # whitelist: - # tags: - # - CartridgeLightRifle - # capacity: 10 - # proto: CartridgeLightRifleRubber +- type: entity + id: Kardashev-MosinNonlethal + parent: WeaponSniperMosin + suffix: Non-lethal + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeLightRifle + capacity: 10 + proto: CartridgeLightRifleRubber From f4c932f02b1859f0c7ae60c8d9bbc47dac2110e4 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 19 May 2024 00:47:28 +0300 Subject: [PATCH 03/10] Fixed --- .../Catalog/Fills/Boxes/ammunition.yml | 71 +++++++++++++++++++ .../_NF/Catalog/Fills/Boxes/ammunition.yml | 70 ------------------ 2 files changed, 71 insertions(+), 70 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index f7f09741be8..99d5438ccfe 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -234,3 +234,74 @@ contents: - id: MagazineRiflePractice amount: 4 + +# Frontier: +# CaselessRifle +- type: entity + name: box of .25 caseless (rubber) magazines + parent: BoxMagazine + id: BoxMagazineCaselessRifleRubber + description: A box full of + components: + - type: StorageFill + contents: + - id: MagazineCaselessRifleRubber + amount: 4 + +# LightRifle +- type: entity + name: box of .30 rifle (rubber) magazines + parent: BoxMagazine + id: BoxMagazineLightRifleRubber + description: A box full of .30 rifle (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineLightRifleRubber + amount: 4 + +- type: entity + name: box of Vector (rubber) magazines + parent: BoxMagazine + id: BoxMagazineMagnumSubMachineGunRubber + description: A box full of Vector (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumSubMachineGunRubber + amount: 3 + +# Pistol +- type: entity + name: box of pistol .35 auto (rubber) magazines + parent: BoxMagazine + id: BoxMagazinePistolRubber + description: A box full of pistol .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolRubber + amount: 4 + +- type: entity + name: box of SMG .35 auto (rubber) magazines + parent: BoxMagazine + id: BoxMagazinePistolSubMachineGunRubber + description: A box full of SMG .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunRubber + amount: 3 + +# Rifle +- type: entity + name: box of .20 rifle (rubber) magazines + parent: BoxMagazine + id: BoxMagazineRifleRubber + description: A box full of .20 rifle (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineRifleRubber + amount: 4 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml deleted file mode 100644 index d0f3352a820..00000000000 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml +++ /dev/null @@ -1,70 +0,0 @@ -# As opposed to MagazineBox these are boxes of magazines so BoxMagazine -# CaselessRifle -- type: entity - name: box of .25 caseless (rubber) magazines - parent: BoxMagazine - id: BoxMagazineCaselessRifleRubber - description: A box full of - components: - - type: StorageFill - contents: - - id: MagazineCaselessRifleRubber - amount: 4 - -# LightRifle -- type: entity - name: box of .30 rifle (rubber) magazines - parent: BoxMagazine - id: BoxMagazineLightRifleRubber - description: A box full of .30 rifle (practice) magazines. - components: - - type: StorageFill - contents: - - id: MagazineLightRifleRubber - amount: 4 - -- type: entity - name: box of Vector (rubber) magazines - parent: BoxMagazine - id: BoxMagazineMagnumSubMachineGunRubber - description: A box full of Vector (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazineMagnumSubMachineGunRubber - amount: 3 - -# Pistol -- type: entity - name: box of pistol .35 auto (rubber) magazines - parent: BoxMagazine - id: BoxMagazinePistolRubber - description: A box full of pistol .35 auto (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolRubber - amount: 4 - -- type: entity - name: box of SMG .35 auto (rubber) magazines - parent: BoxMagazine - id: BoxMagazinePistolSubMachineGunRubber - description: A box full of SMG .35 auto (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunRubber - amount: 3 - -# Rifle -- type: entity - name: box of .20 rifle (rubber) magazines - parent: BoxMagazine - id: BoxMagazineRifleRubber - description: A box full of .20 rifle (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazineRifleRubber - amount: 4 From 1eb245ae89a80961dda52a00805cf52ae398843f Mon Sep 17 00:00:00 2001 From: Dvir Date: Sun, 19 May 2024 00:56:51 +0300 Subject: [PATCH 04/10] Fix --- .../Fills/Items/weapon_cases_shuttle_guns.yml | 100 +++++++++--------- .../Objects/Weapons/Guns/Guns/revolvers.yml | 46 ++++---- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml index 5cbddced502..d7cd5b79acb 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml @@ -45,16 +45,16 @@ - id: WeaponRevolverArgenti - id: MagazineBoxRifle -# WeaponRevolverArgentiNonlethal # Frontier - TODO: Restore this later -# - type: entity - # parent: WeaponCaseShortShuttle - # id: ShuttleWeaponRevolverArgentiNonlethal - # noSpawn: true - # components: - # - type: StorageFill - # contents: - # - id: WeaponRevolverArgentiNonlethal - # - id: MagazineBoxRifleRubber +# WeaponRevolverArgentiNonlethal +- type: entity + parent: WeaponCaseShortShuttle + id: ShuttleWeaponRevolverArgentiNonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRevolverArgentiNonlethal + - id: MagazineBoxRifleRubber # WeaponSniperMosin - type: entity @@ -67,16 +67,16 @@ - id: WeaponSniperMosin - id: MagazineBoxLightRifle -# Kardashev-MosinNonlethal # Frontier - TODO: Restore this later -# - type: entity - # parent: WeaponCaseLongShuttle - # id: ShuttleKardashev-MosinNonlethal - # noSpawn: true - # components: - # - type: StorageFill - # contents: - # - id: Kardashev-MosinNonlethal - # - id: MagazineBoxLightRifleRubber +# Kardashev-MosinNonlethal +- type: entity + parent: WeaponCaseLongShuttle + id: ShuttleKardashev-MosinNonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: Kardashev-MosinNonlethal + - id: MagazineBoxLightRifleRubber # T2: # WeaponPistolMk58lethal @@ -90,16 +90,16 @@ - id: WeaponPistolMk58 - id: MagazinePistol -# WeaponPistolMk58Nonlethal # Frontier - TODO: Restore this later -# - type: entity - # parent: WeaponCaseShortShuttle - # id: ShuttleWeaponPistolMk58Nonlethal - # noSpawn: true - # components: - # - type: StorageFill - # contents: - # - id: WeaponPistolMk58Nonlethal - # - id: MagazinePistolRubber +# WeaponPistolMk58Nonlethal +- type: entity + parent: WeaponCaseShortShuttle + id: ShuttleWeaponPistolMk58Nonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponPistolMk58Nonlethal + - id: MagazinePistolRubber # WeaponRevolverDeckard - type: entity @@ -112,16 +112,16 @@ - id: WeaponRevolverDeckard - id: SpeedLoaderMagnum -# WeaponRevolverDeckardNonlethal # Frontier - TODO: Restore this later -# - type: entity - # parent: WeaponCaseShortShuttle - # id: ShuttleWeaponRevolverDeckardNonlethal - # noSpawn: true - # components: - # - type: StorageFill - # contents: - # - id: WeaponRevolverDeckardNonlethal - # - id: SpeedLoaderMagnumRubber +# WeaponRevolverDeckardNonlethal +- type: entity + parent: WeaponCaseShortShuttle + id: ShuttleWeaponRevolverDeckardNonlethal + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponRevolverDeckardNonlethal + - id: SpeedLoaderMagnumRubber # WeaponShotgunDoubleBarreled - type: entity @@ -134,16 +134,16 @@ - id: WeaponShotgunDoubleBarreled - id: BoxLethalshot -# WeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore this later -# - type: entity - # parent: WeaponCaseLongShuttle - # id: ShuttleWeaponShotgunDoubleBarreledRubber - # noSpawn: true - # components: - # - type: StorageFill - # contents: - # - id: WeaponShotgunDoubleBarreledRubber - # - id: BoxBeanbag +# WeaponShotgunDoubleBarreledRubber +- type: entity + parent: WeaponCaseLongShuttle + id: ShuttleWeaponShotgunDoubleBarreledRubber + noSpawn: true + components: + - type: StorageFill + contents: + - id: WeaponShotgunDoubleBarreledRubber + - id: BoxBeanbag # WeaponShotgunSawn - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml index 6db0b8468c2..46a5c2a1c8f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml @@ -22,27 +22,27 @@ - type: StaticPrice price: 200 -# - type: entity - # parent: WeaponRevolverArgenti - # id: WeaponRevolverArgentiNonlethal - # suffix: Non-lethal - # components: - # - type: RevolverAmmoProvider - # whitelist: - # tags: - # - CartridgeRifle - # proto: CartridgeRifleRubber - # capacity: 6 - # chambers: [ True, True, True, True, True, True ] - # ammoSlots: [ null, null, null, null, null, null ] +- type: entity + parent: WeaponRevolverArgenti + id: WeaponRevolverArgentiNonlethal + suffix: Non-lethal + components: + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeRifle + proto: CartridgeRifleRubber + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] -# - type: entity - # parent: WeaponRevolverDeckard - # id: WeaponRevolverDeckardNonlethal - # suffix: Non-lethal - # components: - # - type: RevolverAmmoProvider - # capacity: 5 - # proto: CartridgeMagnumRubber - # chambers: [ True, True, True, True, True ] - # ammoSlots: [ null, null, null, null, null ] +- type: entity + parent: WeaponRevolverDeckard + id: WeaponRevolverDeckardNonlethal + suffix: Non-lethal + components: + - type: RevolverAmmoProvider + capacity: 5 + proto: CartridgeMagnumRubber + chambers: [ True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null ] From eab9a88d1bc05a1d629b1bb5d2afad692092ac33 Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 20 May 2024 23:24:51 +0300 Subject: [PATCH 05/10] Update pistol.yml --- .../Weapons/Ammunition/Magazines/pistol.yml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml index 53b0070605c..486a6ff5471 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml @@ -11,3 +11,31 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazinePistolRubber + name: pistol magazine (.35 auto rubber) + parent: BaseMagazinePistol + components: + - type: BallisticAmmoProvider + proto: CartridgePistolRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazinePistolSubMachineGunRubber + name: SMG magazine (.35 auto rubber) + parent: BaseMagazinePistolSubMachineGun + components: + - type: BallisticAmmoProvider + proto: CartridgePistolRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] From c716e4236b5d42cf23bd916ea58de2635c59a5e0 Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 20 May 2024 23:29:46 +0300 Subject: [PATCH 06/10] FIX --- .../Objects/Weapons/Guns/SMGs/smgs.yml | 52 ------------------- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 4 +- .../Objects/Weapons/Guns/SMGs/smgs.yml | 51 ++++++++++++++++++ 3 files changed, 53 insertions(+), 54 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 3986c1cb7dc..1cdf6b8d3ec 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -261,55 +261,3 @@ steps: 6 zeroVisible: true - type: Appearance - -# Rubber -- type: entity - name: Drozd - parent: WeaponSubMachineGunDrozd - id: WeaponSubMachineGunDrozdRubber - suffix: Non-Lethal - components: - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistolSubMachineGunRubber - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 2 - whitelist: - tags: - - MagazinePistolSubMachineGun - gun_chamber: - name: Chamber - startingItem: CartridgePistolRubber - priority: 1 - whitelist: - tags: - - CartridgePistol - -- type: entity - name: Vector - parent: WeaponSubMachineGunVector - id: WeaponSubMachineGunVectorRubber - description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. - suffix: Non-Lethal - components: - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineMagnumSubMachineGunRubber - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineMagnumSubMachineGun - gun_chamber: - name: Chamber - startingItem: CartridgeMagnumRubber - priority: 1 - whitelist: - tags: - - CartridgeMagnum diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 3baafe4dd11..4b9ba13d4fc 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -29,7 +29,7 @@ id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984Nonlethal + pocket1: WeaponPistolN1984 pocket2: FlashlightSeclite - type: startingGear @@ -46,7 +46,7 @@ id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled - pocket1: WeaponPistolN1984Nonlethal + pocket1: WeaponPistolN1984 pocket2: FlashlightSeclite - type: startingGear diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml new file mode 100644 index 00000000000..0872f82c26e --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -0,0 +1,51 @@ +# Rubber +- type: entity + name: Drozd + parent: WeaponSubMachineGunDrozd + id: WeaponSubMachineGunDrozdRubber + suffix: Non-Lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolSubMachineGunRubber + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolSubMachineGun + gun_chamber: + name: Chamber + startingItem: CartridgePistolRubber + priority: 1 + whitelist: + tags: + - CartridgePistol + +- type: entity + name: Vector + parent: WeaponSubMachineGunVector + id: WeaponSubMachineGunVectorRubber + description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. + suffix: Non-Lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineMagnumSubMachineGunRubber + insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineMagnumSubMachineGun + gun_chamber: + name: Chamber + startingItem: CartridgeMagnumRubber + priority: 1 + whitelist: + tags: + - CartridgeMagnum From d977919d78e94711dce07a24f34cc1186f96ed12 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 21 May 2024 00:02:21 +0300 Subject: [PATCH 07/10] More fix --- .../Catalog/Fills/Boxes/ammunition.yml | 71 ------------------- .../Guns/Ammunition/Boxes/caseless_rifle.yml | 36 ---------- .../Guns/Ammunition/Boxes/light_rifle.yml | 15 ---- .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 15 ---- .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 36 ---------- .../_NF/Catalog/Fills/Boxes/ammunition.yml | 69 ++++++++++++++++++ .../Guns/Ammunition/Boxes/caseless_rifle.yml | 35 +++++++++ .../Guns/Ammunition/Boxes/light_rifle.yml | 14 ++++ .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 14 ++++ .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 35 +++++++++ 10 files changed, 167 insertions(+), 173 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index 99d5438ccfe..f7f09741be8 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -234,74 +234,3 @@ contents: - id: MagazineRiflePractice amount: 4 - -# Frontier: -# CaselessRifle -- type: entity - name: box of .25 caseless (rubber) magazines - parent: BoxMagazine - id: BoxMagazineCaselessRifleRubber - description: A box full of - components: - - type: StorageFill - contents: - - id: MagazineCaselessRifleRubber - amount: 4 - -# LightRifle -- type: entity - name: box of .30 rifle (rubber) magazines - parent: BoxMagazine - id: BoxMagazineLightRifleRubber - description: A box full of .30 rifle (practice) magazines. - components: - - type: StorageFill - contents: - - id: MagazineLightRifleRubber - amount: 4 - -- type: entity - name: box of Vector (rubber) magazines - parent: BoxMagazine - id: BoxMagazineMagnumSubMachineGunRubber - description: A box full of Vector (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazineMagnumSubMachineGunRubber - amount: 3 - -# Pistol -- type: entity - name: box of pistol .35 auto (rubber) magazines - parent: BoxMagazine - id: BoxMagazinePistolRubber - description: A box full of pistol .35 auto (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolRubber - amount: 4 - -- type: entity - name: box of SMG .35 auto (rubber) magazines - parent: BoxMagazine - id: BoxMagazinePistolSubMachineGunRubber - description: A box full of SMG .35 auto (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunRubber - amount: 3 - -# Rifle -- type: entity - name: box of .20 rifle (rubber) magazines - parent: BoxMagazine - id: BoxMagazineRifleRubber - description: A box full of .20 rifle (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazineRifleRubber - amount: 4 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 063268d8b53..98ad35b70d2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -65,27 +65,6 @@ zeroVisible: false - type: Appearance -- type: entity - parent: BaseMagazineBoxCaselessRifle - id: MagazineBoxCaselessRifleBigRubber - name: ammunition box (.25 caseless rubber) - components: - - type: BallisticAmmoProvider - capacity: 200 - proto: CartridgeCaselessRifleRubber - - type: Sprite - layers: - - state: base-b - map: ["enum.GunVisualLayers.Base"] - - state: magb-1 - map: ["enum.GunVisualLayers.Mag"] - - state: rubber-b - - type: MagazineVisuals - magState: magb - steps: 2 - zeroVisible: false - - type: Appearance - - type: entity parent: BaseMagazineBoxCaselessRifle id: MagazineBoxCaselessRifle @@ -114,18 +93,3 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: practice - -- type: entity - parent: BaseMagazineBoxCaselessRifle - id: MagazineBoxCaselessRifleRubber - name: ammunition box (.25 caseless rubber) - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleRubber - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: rubber diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index bdb4054dfab..3241a892262 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -74,21 +74,6 @@ map: ["enum.GunVisualLayers.Mag"] - state: practice -- type: entity - parent: BaseMagazineBoxLightRifle - id: MagazineBoxLightRifleRubber - name: ammunition box (.30 rifle rubber) - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleRubber - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: rubber - - type: entity id: MagazineBoxLightRifleIncendiary parent: BaseMagazineBoxLightRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 26fc8c10fc8..018d812e3f5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -53,21 +53,6 @@ map: ["enum.GunVisualLayers.Mag"] - state: practice -- type: entity - parent: BaseMagazineBoxMagnum - id: MagazineBoxMagnumRubber - name: ammunition box (.45 magnum rubber) - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumRubber - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: rubber - - type: entity id: MagazineBoxMagnumIncendiary parent: BaseMagazineBoxMagnum diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index 05fe960fcbf..7a5f5d27ca6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -44,27 +44,6 @@ zeroVisible: false - type: Appearance -- type: entity - parent: BaseMagazineBoxRifle - id: MagazineBoxRifleBigRubber - name: ammunition box (.20 rifle rubber) - components: - - type: BallisticAmmoProvider - capacity: 200 - proto: CartridgeRiflePractice - - type: Sprite - layers: - - state: base-b - map: ["enum.GunVisualLayers.Base"] - - state: magb-1 - map: ["enum.GunVisualLayers.Mag"] - - state: practice-b - - type: MagazineVisuals - magState: magb - steps: 2 - zeroVisible: false - - type: Appearance - - type: entity parent: BaseMagazineBoxRifle id: MagazineBoxRifle @@ -94,21 +73,6 @@ map: ["enum.GunVisualLayers.Mag"] - state: practice -- type: entity - parent: BaseMagazineBoxRifle - id: MagazineBoxRifleRubber - name: ammunition box (.20 rifle rubber) - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleRubber - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: rubber - - type: entity id: MagazineBoxRifleIncendiary parent: BaseMagazineBoxRifle diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml new file mode 100644 index 00000000000..d047b1ab548 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml @@ -0,0 +1,69 @@ +# CaselessRifle +- type: entity + name: box of .25 caseless (rubber) magazines + parent: BoxMagazine + id: BoxMagazineCaselessRifleRubber + description: A box full of + components: + - type: StorageFill + contents: + - id: MagazineCaselessRifleRubber + amount: 4 + +# LightRifle +- type: entity + name: box of .30 rifle (rubber) magazines + parent: BoxMagazine + id: BoxMagazineLightRifleRubber + description: A box full of .30 rifle (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineLightRifleRubber + amount: 4 + +- type: entity + name: box of Vector (rubber) magazines + parent: BoxMagazine + id: BoxMagazineMagnumSubMachineGunRubber + description: A box full of Vector (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumSubMachineGunRubber + amount: 3 + +# Pistol +- type: entity + name: box of pistol .35 auto (rubber) magazines + parent: BoxMagazine + id: BoxMagazinePistolRubber + description: A box full of pistol .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolRubber + amount: 4 + +- type: entity + name: box of SMG .35 auto (rubber) magazines + parent: BoxMagazine + id: BoxMagazinePistolSubMachineGunRubber + description: A box full of SMG .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunRubber + amount: 3 + +# Rifle +- type: entity + name: box of .20 rifle (rubber) magazines + parent: BoxMagazine + id: BoxMagazineRifleRubber + description: A box full of .20 rifle (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineRifleRubber + amount: 4 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml new file mode 100644 index 00000000000..d5d24f82b85 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -0,0 +1,35 @@ +- type: entity + parent: BaseMagazineBoxCaselessRifle + id: MagazineBoxCaselessRifleBigRubber + name: ammunition box (.25 caseless rubber) + components: + - type: BallisticAmmoProvider + capacity: 200 + proto: CartridgeCaselessRifleRubber + - type: Sprite + layers: + - state: base-b + map: ["enum.GunVisualLayers.Base"] + - state: magb-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber-b + - type: MagazineVisuals + magState: magb + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBoxCaselessRifle + id: MagazineBoxCaselessRifleRubber + name: ammunition box (.25 caseless rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml new file mode 100644 index 00000000000..2c30951bc98 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -0,0 +1,14 @@ +- type: entity + parent: BaseMagazineBoxLightRifle + id: MagazineBoxLightRifleRubber + name: ammunition box (.30 rifle rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml new file mode 100644 index 00000000000..84625045327 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -0,0 +1,14 @@ +- type: entity + parent: BaseMagazineBoxMagnum + id: MagazineBoxMagnumRubber + name: ammunition box (.45 magnum rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml new file mode 100644 index 00000000000..67eb0fd869b --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -0,0 +1,35 @@ +- type: entity + parent: BaseMagazineBoxRifle + id: MagazineBoxRifleBigRubber + name: ammunition box (.20 rifle rubber) + components: + - type: BallisticAmmoProvider + capacity: 200 + proto: CartridgeRiflePractice + - type: Sprite + layers: + - state: base-b + map: ["enum.GunVisualLayers.Base"] + - state: magb-1 + map: ["enum.GunVisualLayers.Mag"] + - state: practice-b + - type: MagazineVisuals + magState: magb + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + parent: BaseMagazineBoxRifle + id: MagazineBoxRifleRubber + name: ammunition box (.20 rifle rubber) + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: rubber From 4debe5c54d3c9302b2012962008d88ae0a8b6ae2 Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 21 May 2024 02:21:42 +0300 Subject: [PATCH 08/10] fix --- .../Ammunition/Magazines/caseless_rifle.yml | 49 ------------------- .../Ammunition/Magazines/caseless_rifle.yml | 48 ++++++++++++++++++ 2 files changed, 48 insertions(+), 49 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index 0d16f1e966c..2c23d803e2d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -132,26 +132,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: MagazinePistolCaselessRifleRubber - name: "pistol magazine (.25 caseless rubber)" - parent: BaseMagazinePistolCaselessRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleRubber - capacity: 10 - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 6 - zeroVisible: false - - type: Appearance - - type: entity id: MagazineCaselessRifle name: "magazine (.25 caseless)" @@ -180,20 +160,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineCaselessRifleRubber - name: "magazine (.25 caseless rubber)" - parent: BaseMagazineCaselessRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleRubber - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineCaselessRifleShort name: "short magazine (.25 caseless)" @@ -223,18 +189,3 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: MagazineCaselessRifleShortRubber - name: "short magazine (.25 caseless rubber)" - parent: BaseMagazineCaselessRifleShort - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleRubber - capacity: 20 - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml new file mode 100644 index 00000000000..a0b4ab40003 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -0,0 +1,48 @@ +- type: entity + id: MagazinePistolCaselessRifleRubber + name: "pistol magazine (.25 caseless rubber)" + parent: BaseMagazinePistolCaselessRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifleRubber + capacity: 10 + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 6 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineCaselessRifleRubber + name: "magazine (.25 caseless rubber)" + parent: BaseMagazineCaselessRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineCaselessRifleShortRubber + name: "short magazine (.25 caseless rubber)" + parent: BaseMagazineCaselessRifleShort + components: + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifleRubber + capacity: 20 + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] From 9e4f1030a15963cf5023f7c300f47cf05564493f Mon Sep 17 00:00:00 2001 From: Dvir Date: Tue, 21 May 2024 02:32:47 +0300 Subject: [PATCH 09/10] fix --- .../Ammunition/Cartridges/caseless_rifle.yml | 14 ---------- .../Ammunition/Cartridges/light_rifle.yml | 15 ---------- .../Guns/Ammunition/Cartridges/magnum.yml | 15 ---------- .../Guns/Ammunition/Cartridges/pistol.yml | 15 ---------- .../Guns/Ammunition/Cartridges/rifle.yml | 16 ----------- .../Guns/Ammunition/Magazines/light_rifle.yml | 14 ---------- .../Guns/Ammunition/Magazines/magnum.yml | 28 ------------------- .../Guns/Ammunition/Magazines/rifle.yml | 14 ---------- .../Guns/Ammunition/SpeedLoaders/magnum.yml | 20 ------------- .../Guns/Ammunition/SpeedLoaders/pistol.yml | 19 ------------- .../Objects/Weapons/Guns/Rifles/rifles.yml | 24 ---------------- .../Weapons/Ammunition/Cartridges/pistol.yml | 15 ++++++++++ .../Ammunition/Cartridges/caseless_rifle.yml | 14 ++++++++++ .../Ammunition/Cartridges/light_rifle.yml | 14 ++++++++++ .../Guns/Ammunition/Cartridges/magnum.yml | 14 ++++++++++ .../Guns/Ammunition/Cartridges/rifle.yml | 14 ++++++++++ .../Guns/Ammunition/Magazines/light_rifle.yml | 13 +++++++++ .../Guns/Ammunition/Magazines/magnum.yml | 27 ++++++++++++++++++ .../Guns/Ammunition/Magazines/rifle.yml | 13 +++++++++ .../Guns/Ammunition/SpeedLoaders/magnum.yml | 19 +++++++++++++ .../Guns/Ammunition/SpeedLoaders/pistol.yml | 18 ++++++++++++ .../Objects/Weapons/Guns/Rifles/rifles.yml | 24 ++++++++++++++++ 22 files changed, 185 insertions(+), 194 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index e62c9b40c24..73f29189864 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -44,17 +44,3 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" -- type: entity - id: CartridgeCaselessRifleRubber - name: cartridge (.25 caseless rubber) - parent: BaseCartridgeCaselessRifle - components: - - type: CartridgeAmmo - proto: BulletCaselessRifleRubber - - type: Sprite - layers: - - state: base - map: [ "enum.AmmoVisualLayers.Base" ] - - state: tip - map: [ "enum.AmmoVisualLayers.Tip" ] - color: "#43c4f7" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 34940b1a970..554b96f80bd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -43,21 +43,6 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" -- type: entity - id: CartridgeLightRifleRubber - name: cartridge (.30 rifle rubber) - parent: BaseCartridgeLightRifle - components: - - type: CartridgeAmmo - proto: BulletLightRifleRubber - - type: Sprite - layers: - - state: base - map: [ "enum.AmmoVisualLayers.Base" ] - - state: tip - map: [ "enum.AmmoVisualLayers.Tip" ] - color: "#43c4f7" - - type: entity id: CartridgeLightRifleIncendiary name: cartridge (.30 rifle incendiary) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 932d3b9a1f0..95e98b7f45b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -43,21 +43,6 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" -- type: entity - id: CartridgeMagnumRubber - name: cartridge (.45 magnum rubber) - parent: BaseCartridgeMagnum - components: - - type: CartridgeAmmo - proto: BulletMagnumRubber - - type: Sprite - layers: - - state: base - map: [ "enum.AmmoVisualLayers.Base" ] - - state: tip - map: [ "enum.AmmoVisualLayers.Tip" ] - color: "#43c4f7" - - type: entity id: CartridgeMagnumIncendiary name: cartridge (.45 magnum incendiary) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index b49beb85e63..b5cb5db1ec9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -43,21 +43,6 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" -- type: entity - id: CartridgePistolRubber - name: cartridge (.35 auto rubber) - parent: BaseCartridgePistol - components: - - type: CartridgeAmmo - proto: BulletPistolRubber - - type: Sprite - layers: - - state: base - map: [ "enum.AmmoVisualLayers.Base" ] - - state: tip - map: [ "enum.AmmoVisualLayers.Tip" ] - color: "#43c4f7" - - type: entity id: CartridgePistolIncendiary name: cartridge (.35 auto incendiary) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index b7146bc1272..fbd7c568c0e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -43,22 +43,6 @@ map: [ "enum.AmmoVisualLayers.Tip" ] color: "#dbdbdb" - -- type: entity - id: CartridgeRifleRubber - name: cartridge (.20 rifle rubber) - parent: BaseCartridgeRifle - components: - - type: CartridgeAmmo - proto: BulletRifleRubber - - type: Sprite - layers: - - state: base - map: [ "enum.AmmoVisualLayers.Base" ] - - state: tip - map: [ "enum.AmmoVisualLayers.Tip" ] - color: "#43c4f7" - - type: entity id: CartridgeRifleIncendiary name: cartridge (.20 rifle incendiary) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index a703b60e58a..e7b0a803b70 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -95,20 +95,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineLightRifleRubber - name: "magazine (.30 rifle rubber)" - parent: BaseMagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleRubber - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineLightRifleUranium name: "magazine (.30 rifle uranium)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index fc506ec594a..304014d11b4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -88,20 +88,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineMagnumRubber - name: pistol magazine (.45 magnum rubber) - parent: BaseMagazineMagnum - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumRubber - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineMagnumUranium name: pistol magazine (.45 magnum uranium) @@ -171,20 +157,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineMagnumSubMachineGunRubber - name: "Vector magazine (.45 magnum rubber)" - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumRubber - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineMagnumSubMachineGunUranium name: "Vector magazine (.45 magnum uranium)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 7d8aeb93463..b2148ba1b2d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -82,20 +82,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineRifleRubber - name: "magazine (.20 rifle rubber)" - parent: BaseMagazineRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleRubber - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineRifleUranium name: "magazine (.20 rifle uranium)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml index d8e2c908b6f..08d50db9b2c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -80,26 +80,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: SpeedLoaderMagnumRubber - name: "speed loader (.45 magnum rubber)" - parent: BaseSpeedLoaderMagnum - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumRubber - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi - layers: - - state: base - map: [ "enum.GunVisualLayers.Base" ] - - state: rubber-6 - map: [ "enum.GunVisualLayers.Mag" ] - - type: MagazineVisuals - magState: rubber - steps: 7 - zeroVisible: false - - type: Appearance - - type: entity id: SpeedLoaderMagnumAP name: "speed loader (.45 magnum armor-piercing)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml index 1fef25f16fa..3ce419b2c3c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -57,22 +57,3 @@ steps: 7 zeroVisible: false - type: Appearance - -- type: entity - id: SpeedLoaderPistolRubber - name: "speed loader (.35 auto rubber)" - parent: BaseSpeedLoaderPistol - components: - - type: BallisticAmmoProvider - proto: CartridgePistolRubber - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: rubber-6 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: rubber - steps: 7 - zeroVisible: false - - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 0e7f1a62272..0d8560376cd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -187,27 +187,3 @@ zeroVisible: true - type: Appearance -- type: entity - name: Lecter - parent: WeaponRifleLecter - id: WeaponRifleLecterRubber - suffix: Non-lethal - components: - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineRifleRubber - 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: CartridgeRifleRubber - priority: 1 - whitelist: - tags: - - CartridgeRifle diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml index f6764e77dad..36dd79ce38f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml @@ -5,3 +5,18 @@ components: - type: CartridgeAmmo proto: BulletPistolEmp + +- type: entity + id: CartridgePistolRubber + name: cartridge (.35 auto rubber) + parent: BaseCartridgePistol + components: + - type: CartridgeAmmo + proto: BulletPistolRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml new file mode 100644 index 00000000000..304364fee41 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -0,0 +1,14 @@ +- type: entity + id: CartridgeCaselessRifleRubber + name: cartridge (.25 caseless rubber) + parent: BaseCartridgeCaselessRifle + components: + - type: CartridgeAmmo + proto: BulletCaselessRifleRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml new file mode 100644 index 00000000000..d1372f9334d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -0,0 +1,14 @@ +- type: entity + id: CartridgeLightRifleRubber + name: cartridge (.30 rifle rubber) + parent: BaseCartridgeLightRifle + components: + - type: CartridgeAmmo + proto: BulletLightRifleRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml new file mode 100644 index 00000000000..6d522b6e6f8 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -0,0 +1,14 @@ +- type: entity + id: CartridgeMagnumRubber + name: cartridge (.45 magnum rubber) + parent: BaseCartridgeMagnum + components: + - type: CartridgeAmmo + proto: BulletMagnumRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml new file mode 100644 index 00000000000..aee8ab56851 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -0,0 +1,14 @@ +- type: entity + id: CartridgeRifleRubber + name: cartridge (.20 rifle rubber) + parent: BaseCartridgeRifle + components: + - type: CartridgeAmmo + proto: BulletRifleRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml new file mode 100644 index 00000000000..0681df2dc86 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -0,0 +1,13 @@ +- type: entity + id: MagazineLightRifleRubber + name: "magazine (.30 rifle rubber)" + parent: BaseMagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml new file mode 100644 index 00000000000..7cb9620abe8 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -0,0 +1,27 @@ +- type: entity + id: MagazineMagnumRubber + name: pistol magazine (.45 magnum rubber) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineMagnumSubMachineGunRubber + name: "Vector magazine (.45 magnum rubber)" + parent: BaseMagazineMagnumSubMachineGun + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml new file mode 100644 index 00000000000..32b8fe61e2a --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -0,0 +1,13 @@ +- type: entity + id: MagazineRifleRubber + name: "magazine (.20 rifle rubber)" + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml new file mode 100644 index 00000000000..8f845f3adcb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -0,0 +1,19 @@ +- type: entity + id: SpeedLoaderMagnumRubber + name: "speed loader (.45 magnum rubber)" + parent: BaseSpeedLoaderMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: rubber-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: rubber + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml new file mode 100644 index 00000000000..99435076361 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -0,0 +1,18 @@ +- type: entity + id: SpeedLoaderPistolRubber + name: "speed loader (.35 auto rubber)" + parent: BaseSpeedLoaderPistol + components: + - type: BallisticAmmoProvider + proto: CartridgePistolRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: rubber-6 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: rubber + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml new file mode 100644 index 00000000000..24cfd29260f --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -0,0 +1,24 @@ +- type: entity + name: Lecter + parent: WeaponRifleLecter + id: WeaponRifleLecterRubber + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifleRubber + 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: CartridgeRifleRubber + priority: 1 + whitelist: + tags: + - CartridgeRifle From 09a6dae044710327c88e6103b7d94902fc9549da Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 25 May 2024 19:05:57 +0300 Subject: [PATCH 10/10] Update smgs.yml --- .../Objects/Weapons/Guns/SMGs/smgs.yml | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 0872f82c26e..a9b5c3c12bf 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -23,29 +23,3 @@ whitelist: tags: - CartridgePistol - -- type: entity - name: Vector - parent: WeaponSubMachineGunVector - id: WeaponSubMachineGunVectorRubber - description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. - suffix: Non-Lethal - components: - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineMagnumSubMachineGunRubber - insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineMagnumSubMachineGun - gun_chamber: - name: Chamber - startingItem: CartridgeMagnumRubber - priority: 1 - whitelist: - tags: - - CartridgeMagnum