diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index af7776e600..cd3eb15581 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -22,17 +22,6 @@ - id: MagazinePistolCaselessRifle amount: 6 -- type: entity - name: box of .25 caseless (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazinePistolCaselessRifleHighVelocity - description: A box full of .25 caseless high-velocity magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolCaselessRifleHighVelocity - amount: 6 - - type: entity name: box of .25 caseless (practice) magazines parent: BoxMagazine @@ -67,17 +56,6 @@ - id: MagazineLightRifle amount: 6 -- type: entity - name: box of .30 rifle (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazineLightRifleHighVelocity - description: A box full of .30 rifle (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazineLightRifleHighVelocity - amount: 6 - - type: entity name: box of .30 rifle (practice) magazines parent: BoxMagazine @@ -126,17 +104,6 @@ - state: box_science - state: omegacart -- type: entity - name: box of Vector (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazineMagnumSubMachineGunHighVelocity - description: A box full of Vector (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazineMagnumSubMachineGunHighVelocity - amount: 3 - - type: entity name: box of Vector (practice) magazines parent: BoxMagazine @@ -182,17 +149,6 @@ - id: MagazinePistol amount: 6 -- type: entity - name: box of pistol .35 auto (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazinePistolHighVelocity - description: A box full of pistol .35 auto (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolHighVelocity - amount: 6 - - type: entity name: box of pistol .35 auto (practice) magazines parent: BoxMagazine @@ -226,17 +182,6 @@ - id: MagazinePistolHighCapacity amount: 6 -- type: entity - name: box of machine pistol .35 auto (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazinePistolHighCapacityHighVelocity - description: A box full of machine pistol .35 auto (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolHighCapacityHighVelocity - amount: 6 - - type: entity name: box of machine pistol .35 auto (practice) magazines parent: BoxMagazine @@ -271,17 +216,6 @@ - id: MagazinePistolSubMachineGun amount: 3 -- type: entity - name: box of SMG .35 auto (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazinePistolSubMachineGunHighVelocity - description: A box full of SMG .35 auto (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunHighVelocity - amount: 3 - - type: entity name: box of SMG .35 auto (practice) magazines parent: BoxMagazine @@ -479,17 +413,6 @@ - id: MagazineRifle amount: 6 -- type: entity - name: box of .20 rifle (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazineRifleHighVelocity - description: A box full of .20 rifle (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazineRifleHighVelocity - amount: 6 - - type: entity name: box of .20 rifle (practice) magazines parent: BoxMagazine diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 999914eb42..3c539243c9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -1,27 +1,22 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: AmmoVendInventory startingInventory: MagazineBoxCaselessRifle: 3 - MagazineBoxCaselessRifleHighVelocity: 3 MagazineBoxCaselessRiflePractice: 3 MagazineBoxCaselessRifleRubber: 3 MagazineBoxLightRifleBig: 3 - MagazineBoxLightRifleHighVelocity: 3 MagazineBoxLightRiflePractice: 3 MagazineBoxLightRifleRubber: 3 MagazineBoxMagnum: 3 - MagazineBoxMagnumHighVelocity: 3 MagazineBoxMagnumPractice: 3 MagazineBoxMagnumRubber: 3 MagazineBoxPistol: 3 - MagazineBoxPistolHighVelocity: 3 MagazineBoxPistolPractice: 3 MagazineBoxPistolRubber: 3 MagazineBoxRifle: 3 - MagazineBoxRifleHighVelocity: 3 MagazineBoxRiflePractice: 3 MagazineBoxRifleRubber: 3 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 6e73310a85..4a77bfcfc5 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 @@ -100,21 +100,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxCaselessRifle - id: MagazineBoxCaselessRifleHighVelocity - name: ammunition box (.25 caseless high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxCaselessRifle id: MagazineBoxCaselessRiflePractice 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 7018ff3764..1c8fbc26e1 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 @@ -59,21 +59,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxLightRifle - id: MagazineBoxLightRifleHighVelocity - name: ammunition box (.30 rifle high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRiflePractice 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 9f7adc7868..5a9a850e9c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -38,21 +38,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxMagnum - id: MagazineBoxMagnumHighVelocity - name: ammunition box (.45 magnum high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxMagnum id: MagazineBoxMagnumPractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index d8bab16cdb..a9a78f399a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -39,21 +39,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxPistol - id: MagazineBoxPistolHighVelocity - name: ammunition box (.35 auto high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxPistol id: MagazineBoxPistolPractice 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 260237c3c0..3725ad91af 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -79,21 +79,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxRifle - id: MagazineBoxRifleHighVelocity - name: ammunition box (.20 rifle high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxRifle id: MagazineBoxRiflePractice 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 87df215fe3..4a8e64d9a1 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 @@ -29,14 +29,6 @@ - type: CartridgeAmmo proto: BulletCaselessRifle -- type: entity - id: CartridgeCaselessRifleHighVelocity - name: cartridge (.25 caseless high-velocity) - parent: BaseCartridgeCaselessRifle - components: - - type: CartridgeAmmo - proto: BulletCaselessRifleHighVelocity - - type: entity id: CartridgeCaselessRiflePractice name: cartridge (.25 caseless practice) 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 248a919ced..c595ea141e 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 @@ -28,14 +28,6 @@ - type: CartridgeAmmo proto: BulletLightRifle -- type: entity - id: CartridgeLightRifleHighVelocity - name: cartridge (.30 rifle high-velocity) - parent: BaseCartridgeLightRifle - components: - - type: CartridgeAmmo - proto: BulletLightRifleHighVelocity - - type: entity id: CartridgeLightRiflePractice name: cartridge (.30 rifle practice) 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 4309471c8e..2368b81269 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -28,14 +28,6 @@ - type: CartridgeAmmo proto: BulletMagnum -- type: entity - id: CartridgeMagnumHighVelocity - name: cartridge (.45 magnum high-velocity) - parent: BaseCartridgeMagnum - components: - - type: CartridgeAmmo - proto: BulletMagnumHighVelocity - - type: entity id: CartridgeMagnumPractice name: cartridge (.45 magnum practice) 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 0210b78c31..828251ade7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -28,14 +28,6 @@ - type: CartridgeAmmo proto: BulletPistol -- type: entity - id: CartridgePistolHighVelocity - name: cartridge (.35 auto high-velocity) - parent: BaseCartridgePistol - components: - - type: CartridgeAmmo - proto: BulletPistolHighVelocity - - type: entity id: CartridgePistolPractice name: cartridge (.35 auto practice) 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 f30aa1a372..4a6229ea2a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -28,14 +28,6 @@ - type: CartridgeAmmo proto: BulletRifle -- type: entity - id: CartridgeRifleHighVelocity - name: cartridge (.20 rifle high-velocity) - parent: BaseCartridgeRifle - components: - - type: CartridgeAmmo - proto: BulletRifleHighVelocity - - type: entity id: CartridgeRiflePractice name: cartridge (.20 rifle practice) 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 c746534674..773ff01ed8 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 @@ -112,26 +112,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: MagazinePistolCaselessRifleHighVelocity - name: "pistol magazine (.25 caseless high-velocity)" - parent: BaseMagazinePistolCaselessRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity - capacity: 10 - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 6 - zeroVisible: false - - type: Appearance - - type: entity id: MagazinePistolCaselessRiflePractice name: "pistol magazine (.25 caseless practice)" @@ -186,20 +166,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineCaselessRifleHighVelocity - name: "magazine (.25 caseless high-velocity)" - parent: BaseMagazineCaselessRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineCaselessRiflePractice name: "magazine (.25 caseless practice)" @@ -243,21 +209,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineCaselessRifleShortHighVelocity - name: "short magazine (.25 caseless high-velocity)" - parent: BaseMagazineCaselessRifleShort - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity - capacity: 20 - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineCaselessRifleShortPractice name: "short magazine (.25 caseless practice)" 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 f09d3e3bb6..e586364369 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 @@ -68,20 +68,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineLightRifleHighVelocity - name: "magazine (.30 rifle high-velocity)" - parent: BaseMagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineLightRiflePractice name: "magazine (.30 rifle practice)" 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 ab439303c9..6060898d49 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -45,20 +45,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineMagnumSubMachineGunHighVelocity - name: "Vector magazine (.45 magnum High-Velocity)" - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineMagnumSubMachineGunPractice name: "Vector magazine (.45 magnum practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 42bb148742..4ed38fdeb3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -142,20 +142,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazinePistolHighVelocity - name: pistol magazine (.35 auto high-velocity) - parent: BaseMagazinePistol - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazinePistolPractice name: pistol magazine (.35 auto practice) @@ -198,20 +184,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazinePistolHighCapacityHighVelocity - name: machine pistol magazine (.35 auto high-velocity) - parent: BaseMagazinePistolHighCapacity - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazinePistolHighCapacityPractice name: machine pistol magazine (.35 auto practice) @@ -260,20 +232,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazinePistolSubMachineGunHighVelocity - name: SMG magazine (.35 auto high-velocity) - parent: BaseMagazinePistolSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazinePistolSubMachineGunPractice name: SMG magazine (.35 auto practice) 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 d2b0ea32ea..ca1f9b8de2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -47,20 +47,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineRifleHighVelocity - name: "magazine (.20 rifle high-velocity)" - parent: BaseMagazineRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineRiflePractice name: "magazine (.20 rifle practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index a86de79aa0..2e4a7271f4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -1,6 +1,6 @@ - type: entity noSpawn: true - parent: BaseBulletHighVelocity + parent: BaseBullet id: BulletAntiMateriel name: bullet (.60 anti-materiel) components: 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 694d9589de..5ce0bf82fe 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 @@ -9,17 +9,6 @@ types: Piercing: 19 -- type: entity - id: BulletCaselessRifleHighVelocity - name: bullet (.25 caseless high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 22 - - type: entity id: BulletCaselessRiflePractice name: bullet (.25 caseless practice) 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 8bf5ce5e62..315f1af7e1 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 @@ -9,17 +9,6 @@ types: Piercing: 19 -- type: entity - id: BulletLightRifleHighVelocity - name: bullet (.20 rifle high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 21 - - type: entity id: BulletLightRiflePractice name: bullet (.20 rifle practice) 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 c6ed5e3d6e..2da1e190d9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -9,17 +9,6 @@ types: Piercing: 35 -- type: entity - id: BulletMagnumHighVelocity - name: bullet (.45 magnum high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 44 # 25% increase - - type: entity id: BulletMagnumPractice name: bullet (.45 magnum practice) @@ -65,4 +54,4 @@ damage: types: Piercing: 26 # 20% decrease - ignoreResistances: true \ No newline at end of file + ignoreResistances: true 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 8474160ef7..f3e7d1e6ba 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -9,17 +9,6 @@ types: Piercing: 16 -- type: entity - id: BulletPistolHighVelocity - name: bullet (.35 auto high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 19 - - type: entity id: BulletPistolPractice name: bullet (.35 auto practice) 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 c3a0496e18..009ab6bbb4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -9,17 +9,6 @@ types: Piercing: 17 -- type: entity - id: BulletRifleHighVelocity - name: bullet (0.20 rifle high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 21 - - type: entity id: BulletRiflePractice name: bullet (0.20 rifle practice) 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 b3d63c3c0e..9926b0cf5b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -39,26 +39,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: SpeedLoaderMagnumHighVelocity - name: "speed loader (.45 magnum high-velocity)" - parent: BaseSpeedLoaderMagnum - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumHighVelocity - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi - layers: - - state: base - map: [ "enum.GunVisualLayers.Base" ] - - state: high-velocity-6 - map: [ "enum.GunVisualLayers.Mag" ] - - type: MagazineVisuals - magState: high-velocity - steps: 7 - zeroVisible: false - - type: Appearance - - type: entity id: SpeedLoaderMagnumPractice name: "speed loader (.45 magnum practice)" @@ -117,4 +97,4 @@ magState: base steps: 7 zeroVisible: false - - type: Appearance \ No newline at end of file + - type: Appearance 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 ef869fe4be..1fef25f16f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -39,25 +39,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: SpeedLoaderPistolHighVelocity - name: "speed loader (.35 auto high-velocity)" - parent: BaseSpeedLoaderPistol - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: high-velocity-6 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: high-velocity - steps: 7 - zeroVisible: false - - type: Appearance - - type: entity id: SpeedLoaderPistolPractice name: "speed loader (.35 auto practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index 06479d26ae..bd789402d2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -102,7 +102,7 @@ - type: entity id: BulletInstakillMagic name: magical lead cylinder - parent: BaseBulletHighVelocity + parent: BaseBullet noSpawn: true description: This looks familiar. components: @@ -127,7 +127,7 @@ - type: entity id: ProjectileIcicle - parent: BaseBulletHighVelocity + parent: BaseBullet name: Icicle description: Brrrrr. noSpawn: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index f0821be2d9..f9917e7294 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -89,17 +89,6 @@ - BulletImpassable fly-by: *flybyfixture -- type: entity - id: BaseBulletHighVelocity - name: base bullet high-velocity - parent: BaseBullet - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 17 - - type: entity id: BaseBulletPractice name: base bullet practice @@ -321,7 +310,7 @@ - type: entity id: BulletKinetic name: kinetic bolt - parent: BaseBulletHighVelocity + parent: BaseBullet noSpawn: true description: Not too bad, but you still don't want to get hit by it. components: @@ -347,7 +336,7 @@ - type: entity id: BulletCharge name: charge bolt - parent: BaseBulletHighVelocity + parent: BaseBullet noSpawn: true description: Marks a target for additional damage. components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 441fbb6e30..3beddd7e9f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -483,14 +483,6 @@ - MagazineBoxMagnumRubber - MagazineBoxRifleRubber - MagazineBoxLightRifleRubber - - CartridgePistolHighVelocity - - CartridgeMagnumHighVelocity - - CartridgeLightRifleHighVelocity - - CartridgeRifleHighVelocity - - MagazineBoxPistolHighVelocity - - MagazineBoxMagnumHighVelocity - - MagazineBoxLightRifleHighVelocity - - MagazineBoxRifleHighVelocity - ShellShotgunIncendiary - CartridgePistolIncendiary - CartridgeMagnumIncendiary diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index d995a7701e..efe6e0db84 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -304,62 +304,6 @@ Steel: 350 Plastic: 600 -- type: latheRecipe - id: CartridgePistolHighVelocity - result: CartridgePistolHighVelocity - completetime: 2 - materials: - Steel: 20 - -- type: latheRecipe - id: CartridgeMagnumHighVelocity - result: CartridgeMagnumHighVelocity - completetime: 2 - materials: - Steel: 40 - -- type: latheRecipe - id: CartridgeLightRifleHighVelocity - result: CartridgeLightRifleHighVelocity - completetime: 2 - materials: - Steel: 40 - -- type: latheRecipe - id: CartridgeRifleHighVelocity - result: CartridgeRifleHighVelocity - completetime: 2 - materials: - Steel: 30 - -- type: latheRecipe - id: MagazineBoxPistolHighVelocity - result: MagazineBoxPistolHighVelocity - completetime: 5 - materials: - Steel: 1250 - -- type: latheRecipe - id: MagazineBoxMagnumHighVelocity - result: MagazineBoxMagnumHighVelocity - completetime: 5 - materials: - Steel: 2450 - -- type: latheRecipe - id: MagazineBoxLightRifleHighVelocity - result: MagazineBoxLightRifleHighVelocity - completetime: 5 - materials: - Steel: 2050 - -- type: latheRecipe - id: MagazineBoxRifleHighVelocity - result: MagazineBoxRifleHighVelocity - completetime: 5 - materials: - Steel: 1850 - - type: latheRecipe id: ShellShotgunIncendiary result: ShellShotgunIncendiary diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 1b5d739213..32abc1ba04 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -87,25 +87,6 @@ # Tier 2 -- type: technology - id: OptimizedBallistics - name: research-technology-optimized-ballistics - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: hvdisplay - discipline: Arsenal - tier: 2 - cost: 7500 - recipeUnlocks: - - CartridgePistolHighVelocity - - CartridgeMagnumHighVelocity - - CartridgeLightRifleHighVelocity - - CartridgeRifleHighVelocity - - MagazineBoxPistolHighVelocity - - MagazineBoxMagnumHighVelocity - - MagazineBoxLightRifleHighVelocity - - MagazineBoxRifleHighVelocity - - type: technology id: ConcentratedLaserWeaponry name: research-technology-concentrated-laser-weaponry diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png deleted file mode 100644 index 0cf4172164..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json index 8ce4d885e5..7a8e9468ae 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json @@ -25,9 +25,6 @@ { "name": "mag10-1" }, - { - "name": "hv" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/hv.png deleted file mode 100644 index 11cc4b5f65..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json index 787a519c84..583b7e9393 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "magb-1" }, - { - "name": "hv" - }, { "name": "incendiary" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png deleted file mode 100644 index 6e64601f6b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json index 8b856ddf13..1d1e4b68d9 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "cap" }, - { - "name": "hv" - }, { "name": "incendiary" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hv.png deleted file mode 100644 index d9c8bf3dc7..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hvdisplay.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hvdisplay.png deleted file mode 100644 index f83bd2db97..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hvdisplay.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json index 67d525fcfd..bfb2eefc41 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "mag-1" }, - { - "name": "hv" - }, - { - "name": "hvdisplay" - }, { "name": "incendiarydisplay" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/hv.png deleted file mode 100644 index b580737a95..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/hv.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json index 4cb2a76ac5..08e598b8b8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "magb-1" }, - { - "name": "hv" - }, { "name": "incendiary" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png deleted file mode 100644 index 5ac0576375..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json index 7a9840a0b1..7ae6c4a71a 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png deleted file mode 100644 index 5d4f0f47b8..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json index 8675d7f4ab..1d75c67608 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, @@ -26,4 +23,4 @@ "name": "mag-1" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/high_velocity.png deleted file mode 100644 index ac48cd8a41..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json index 8675d7f4ab..1d75c67608 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, @@ -26,4 +23,4 @@ "name": "mag-1" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/high_velocity.png deleted file mode 100644 index 1aa7b1a3a0..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json index 40e76cad7c..dc6dc886cb 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png deleted file mode 100644 index 656c4fa115..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json index ef6749e019..dc2364cfed 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png deleted file mode 100644 index a185c2c441..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json index 2d9f9471b6..dcbc205f54 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/high_velocity.png deleted file mode 100644 index 780d9cc4eb..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json index 945138a8ad..6b3b5e247c 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/high_velocity.png deleted file mode 100644 index 2648265735..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json index 6fc0edd751..8e095fd2f1 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png deleted file mode 100644 index e79fd8b998..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json index ce37ea6c1f..785b31f6be 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png deleted file mode 100644 index e18b146d3b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png deleted file mode 100644 index 3381efe180..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-3.png deleted file mode 100644 index b290fa2fe2..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png deleted file mode 100644 index f9b8504dc8..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-5.png deleted file mode 100644 index 61e1f36628..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png deleted file mode 100644 index 1a08c6a080..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json index 512c3ccb2a..177c5d0d26 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json @@ -31,24 +31,6 @@ { "name": "base-6" }, - { - "name": "high-velocity-1" - }, - { - "name": "high-velocity-2" - }, - { - "name": "high-velocity-3" - }, - { - "name": "high-velocity-4" - }, - { - "name": "high-velocity-5" - }, - { - "name": "high-velocity-6" - }, { "name": "practice-1" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-1.png deleted file mode 100644 index e995979a61..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-2.png deleted file mode 100644 index 09e5f15770..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-3.png deleted file mode 100644 index 502e3d3683..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-4.png deleted file mode 100644 index ad7deaa0b5..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-5.png deleted file mode 100644 index 43baa78b94..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-6.png deleted file mode 100644 index 50db6ec38b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json index cf40a0390e..89bc20ad9a 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json @@ -28,24 +28,6 @@ { "name": "base-6" }, - { - "name": "high-velocity-1" - }, - { - "name": "high-velocity-2" - }, - { - "name": "high-velocity-3" - }, - { - "name": "high-velocity-4" - }, - { - "name": "high-velocity-5" - }, - { - "name": "high-velocity-6" - }, { "name": "practice-1" }, @@ -83,4 +65,4 @@ "name": "rubber-6" } ] -} \ No newline at end of file +} diff --git a/Resources/migration.yml b/Resources/migration.yml index 40436c9637..7cb135062f 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -1,4 +1,4 @@ -# basic dictionary that maps old entity ids to new entity ids. +# basic dictionary that maps old entity ids to new entity ids. # an empty or "null" string results in the entity getting deleted. # e.g., you can swap all walls with windows and delete all tables by adding lines like: @@ -38,7 +38,6 @@ BoxMagazineMagnumSubMachineGunPractice: BoxMagazinePistolSubMachineGunPractice BoxMagazineMagnumSubMachineGunRubber: BoxMagazinePistolSubMachineGunRubber MagazineMagnumSubMachineGun: MagazinePistolSubMachineGun -MagazineMagnumSubMachineGunHighVelocity: MagazinePistolSubMachineGunHighVelocity MagazineMagnumSubMachineGunPractice: MagazinePistolSubMachineGunPractice MagazineMagnumSubMachineGunRubber: MagazinePistolSubMachineGunRubber WeaponSubMachineGunVector: WeaponSubMachineGunDrozd @@ -118,3 +117,38 @@ ClothingEyesGlassesBeer: ClothingEyesHudBeer # 2023-08-01 lantern: Lantern lanternextrabright: LanternFlash + +# 2023-08-04 +BoxMagazineLightRifleHighVelocity: BoxMagazineLightRifle +BoxMagazineMagnumSubMachineGunHighVelocity: BoxMagazineMagnumSubMachineGun +BoxMagazinePistolCaselessRifleHighVelocity: BoxMagazinePistolCaselessRifle +BoxMagazinePistolHighCapacityHighVelocity: BoxMagazinePistolHighCapacity +BoxMagazinePistolHighVelocity: BoxMagazinePistol +BoxMagazinePistolSubMachineGunHighVelocity: BoxMagazinePistolSubMachineGun +BoxMagazineRifleHighVelocity: BoxMagazineRifle +BulletCaselessRifleHighVelocity: BulletCaselessRifle +BulletLightRifleHighVelocity: BulletLightRifle +BulletMagnumHighVelocity: BulletMagnum +BulletPistolHighVelocity: BulletPistol +BulletRifleHighVelocity: BulletRifle +CartridgeCaselessRifleHighVelocity: CartridgeCaselessRifle +CartridgeLightRifleHighVelocity: CartridgeLightRifle +CartridgeMagnumHighVelocity: CartridgeMagnum +CartridgePistolHighVelocity: CartridgePistol +CartridgeRifleHighVelocity: CartridgeRifle +MagazineBoxCaselessRifleHighVelocity: MagazineBoxCaselessRifle +MagazineBoxLightRifleHighVelocity: MagazineBoxLightRifle +MagazineBoxMagnumHighVelocity: MagazineBoxMagnum +MagazineBoxPistolHighVelocity: MagazineBoxPistol +MagazineBoxRifleHighVelocity: MagazineBoxRifle +MagazineCaselessRifleHighVelocity: MagazineCaselessRifle +MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort +MagazineLightRifleHighVelocity: MagazineLightRifle +MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun +MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle +MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacity +MagazinePistolHighVelocity: MagazinePistol +MagazinePistolSubMachineGunHighVelocity: MagazinePistolSubMachineGun +MagazineRifleHighVelocity: MagazineRifle +SpeedLoaderMagnumHighVelocity: SpeedLoaderMagnum +SpeedLoaderPistolHighVelocity: SpeedLoaderPistol