diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index a42d653d52..06005c274f 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -57,27 +57,6 @@ amount: 4 # Magnum -- type: entity - name: box of SMG .45 magnum magazines - parent: BoxMagazine - id: BoxMagazineMagnumSubMachineGun - description: A box full of SMG .45 magnum magazines. - components: - - type: StorageFill - contents: - - id: MagazineMagnumSubMachineGun - amount: 3 - -- type: entity - name: box of SMG .45 magnum (practice) magazines - parent: BoxMagazine - id: BoxMagazineMagnumSubMachineGunPractice - description: A box full of SMG .45 magnum (practice) magazines. - components: - - type: StorageFill - contents: - - id: MagazineMagnumSubMachineGunPractice - amount: 3 # Pistol - type: entity 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 f51b21e1b4..4c3207b9c5 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 @@ -32,25 +32,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: BaseMagazineCaselessRifleShort - name: "caseless rifle short magazine (.25 caseless)" - parent: BaseMagazineCaselessRifle - abstract: true - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifle - capacity: 10 - - type: Item - size: Tiny - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: BaseMagazinePistolCaselessRifle name: "pistol magazine (.25 caseless)" @@ -81,21 +62,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: MagazineCaselessRifle10x24 - name: "box magazine (.25 caseless)" - parent: BaseMagazineCaselessRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifle - capacity: 99 - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi - - type: MagazineVisuals - magState: mag - steps: 8 - zeroVisible: false - - type: entity id: MagazinePistolCaselessRifle name: "pistol magazine (.25 caseless)" @@ -202,51 +168,3 @@ - state: inhand-right-mag - state: inhand-right-stripe color: "#dbdbdb" - -- type: entity - id: MagazineCaselessRifleShort - name: "short magazine (.25 caseless)" - parent: BaseMagazineCaselessRifleShort - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifle - capacity: 20 - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - right: - - state: inhand-right-mag - -- type: entity - id: MagazineCaselessRifleShortPractice - name: "short magazine (.25 caseless practice)" - parent: BaseMagazineCaselessRifleShort - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRiflePractice - capacity: 20 - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#dbdbdb" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#dbdbdb" 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 f56092ba1f..c94e819615 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 @@ -178,36 +178,3 @@ - state: inhand-right-mag - state: inhand-right-stripe color: "#ff6e52" - -- type: entity - id: MagazineLightRifleMaxim - name: "pan magazine (.30 rifle)" - parent: BaseMagazineLightRifle - components: - - type: Tag - tags: - - MagazineLightRiflePan - - type: BallisticAmmoProvider - proto: CartridgeLightRifle - capacity: 96 - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi - -- type: entity - id: MagazineLightRiflePkBox - name: "PK munitions box (.30 rifle)" - parent: BaseMagazineLightRifle - components: - - type: Tag - tags: - - MagazineLightRifleBox - - type: BallisticAmmoProvider - proto: CartridgeLightRifle - capacity: 80 - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi - - type: MagazineVisuals - magState: mag - steps: 8 - zeroVisible: false - - type: Appearance 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 705601870f..b3b26be0d1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -14,39 +14,6 @@ - CartridgeMagnum capacity: 7 -- type: entity - id: BaseMagazineMagnumSubMachineGun - name: SMG magazine (.45 magnum) - parent: BaseItem - abstract: true - components: - - type: Tag - tags: - - MagazineMagnumSubMachineGun - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - CartridgeMagnum - capacity: 25 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - - type: entity id: MagazineMagnumEmpty name: pistol magazine (.45 magnum any) @@ -170,122 +137,3 @@ - state: inhand-right-mag - state: inhand-right-stripe color: "#540000" - -- type: entity - id: MagazineMagnumSubMachineGunEmpty - name: SMG magazine (.45 magnum any) - suffix: empty - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: null - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - right: - - state: inhand-right-mag - -- type: entity - id: MagazineMagnumSubMachineGun - name: SMG magazine (.45 magnum) - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnum - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - right: - - state: inhand-right-mag - -- type: entity - id: MagazineMagnumSubMachineGunPractice - name: SMG magazine (.45 magnum practice) - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumPractice - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#dbdbdb" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#dbdbdb" - -- type: entity - id: MagazineMagnumSubMachineGunUranium - name: SMG magazine (.45 magnum uranium) - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumUranium - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#00cd42" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#00cd42" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#00cd42" - -- type: entity - id: MagazineMagnumSubMachineGunPiercing - name: SMG magazine (.45 magnum armour-piercing) - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumAP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#540000" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#540000" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#540000" diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index b67ad820fd..8d6daa226c 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -890,9 +890,6 @@ - type: Tag id: MagazineShotgun -- type: Tag - id: MagazineMagnumSubMachineGun - - type: Tag id: MagazinePistolSubMachineGun diff --git a/Resources/migration.yml b/Resources/migration.yml index 87a996e23b..78d9959c57 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -34,7 +34,7 @@ lanternextrabright: LanternFlash # 2023-08-04 BoxMagazineLightRifleHighVelocity: BoxMagazineLightRifle -BoxMagazineMagnumSubMachineGunHighVelocity: BoxMagazineMagnumSubMachineGun +BoxMagazineMagnumSubMachineGunHighVelocity: null BoxMagazinePistolCaselessRifleHighVelocity: BoxMagazinePistolCaselessRifle BoxMagazinePistolHighCapacityHighVelocity: BoxMagazinePistolHighCapacity BoxMagazinePistolHighVelocity: BoxMagazinePistol @@ -56,9 +56,9 @@ MagazineBoxMagnumHighVelocity: MagazineBoxMagnum MagazineBoxPistolHighVelocity: MagazineBoxPistol MagazineBoxRifleHighVelocity: MagazineBoxRifle MagazineCaselessRifleHighVelocity: MagazineCaselessRifle -MagazineCaselessRifleShortHighVelocity: MagazineCaselessRifleShort +MagazineCaselessRifleShortHighVelocity: null MagazineLightRifleHighVelocity: MagazineLightRifle -MagazineMagnumSubMachineGunHighVelocity: MagazineMagnumSubMachineGun +MagazineMagnumSubMachineGunHighVelocity: null MagazinePistolCaselessRifleHighVelocity: MagazinePistolCaselessRifle MagazinePistolHighCapacityHighVelocity: MagazinePistolHighCapacity MagazinePistolHighVelocity: MagazinePistol @@ -302,11 +302,11 @@ MagazinePistolRubber: MagazinePistol MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle MagazineMagnumRubber: MagazineMagnum -MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun +MagazineMagnumSubMachineGunRubber: null MagazineLightRifleRubber: MagazineLightRifle MagazineRifleRubber: MagazineRifle MagazineCaselessRifleRubber: MagazineCaselessRifle -MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort +MagazineCaselessRifleShortRubber: null SpeedLoaderPistolRubber: SpeedLoaderPistol SpeedLoaderMagnumRubber: SpeedLoaderMagnum MagazineBoxPistolRubber: MagazineBoxPistol @@ -322,7 +322,7 @@ BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun BoxMagazineLightRifleRubber: BoxMagazineLightRifle BoxMagazineRifleRubber: BoxMagazineRifle BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle -BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun +BoxMagazineMagnumSubMachineGunRubber: null WeaponPistolMk58Nonlethal: WeaponPistolMk58 WeaponPistolN1984Nonlethal: WeaponPistolN1984 WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd @@ -654,6 +654,22 @@ SpawnHonkBot: SpawnMobHonkBot CrateFoodPizzaLarge: CrateFoodPizza CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks +# 2025-06-06 +MagazineLightRifleMaxim: null +MagazineLightRiflePkBox: null +MagazineCaselessRifle10x24: null +BaseMagazineCaselessRifleShort: null +MagazineCaselessRifleShort: null +MagazineCaselessRifleShortPractice: null +BaseMagazineMagnumSubMachineGun: null +MagazineMagnumSubMachineGunEmpty: null +MagazineMagnumSubMachineGun: null +MagazineMagnumSubMachineGunPractice: null +MagazineMagnumSubMachineGunUranium: null +MagazineMagnumSubMachineGunPiercing: null +BoxMagazineMagnumSubMachineGun: null +BoxMagazineMagnumSubMachineGunPractice: null + # 2025-06-09 BarSignAlignTile: BarSign BarSignComboCafeAlignTile: BarSignComboCafe