From 9ad43b1944f2a50f69c6eb60f12d575eb56a8a04 Mon Sep 17 00:00:00 2001 From: keekee38 Date: Wed, 25 Feb 2026 13:29:44 -0500 Subject: [PATCH] removing machine pistol mag compatability for the viper and pollock and fixing practice mags (#5296) * sighs * :3 oopsie daisy,,,,, * adding the thingy Signed-off-by: keekee38 * Fix comment Signed-off-by: Stop-Signs --------- Signed-off-by: keekee38 Signed-off-by: Stop-Signs Co-authored-by: Stop-Signs --- .../Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml | 2 +- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 1 - .../_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) 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 5234185d0b..ca60cef073 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -301,7 +301,7 @@ parent: BaseMagazinePistolHighCapacity components: - type: BallisticAmmoProvider - proto: CartridgePistol + proto: CartridgePistolPractice # DeltaV - type: Sprite layers: - state: practice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index d0269c8fd1..9e95f5a20a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -93,7 +93,6 @@ whitelist: tags: - MagazinePistol - - MagazinePistolHighCapacity whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 6787460e23..544236466b 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -20,7 +20,6 @@ whitelist: tags: - MagazinePistol - - MagazinePistolHighCapacity gun_chamber: name: Chamber startingItem: CartridgePistol @@ -59,7 +58,6 @@ whitelist: tags: - MagazinePistol - - MagazinePistolHighCapacity gun_chamber: name: Chamber startingItem: CartridgePistol