From f79a599c6582ff54157aed2a67c5a7dc8c88739e Mon Sep 17 00:00:00 2001 From: freezer dog Date: Mon, 15 Jun 2026 12:46:35 -0400 Subject: [PATCH] fixing machine pistol magazine issues and clearing gun chambers (#5819) * kill... slaughter... * ok why not im gonna clear chambers too * ok maybe thats all the chambers clear * time to find out i screwed up everythin xd * whoops i killed the chambers.... --------- Signed-off-by: freezer dog --- .../Objects/Weapons/Guns/Pistols/pistols.yml | 2 +- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 2 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 69 +++---------------- .../Objects/Weapons/Guns/Rifles/rifles.yml | 24 +------ .../Objects/Weapons/Guns/SMGs/smgs.yml | 24 ------- 5 files changed, 15 insertions(+), 106 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index b20c6e7129f..e0b3dc1c6f0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -49,7 +49,7 @@ whitelist: tags: - MagazinePistol - - MagazinePistolHighCapacity + #- MagazinePistolHighCapacity Delta V - not all pistols can take machine pistol mags whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 1f8958a8f48..c4b91f92027 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -63,9 +63,9 @@ whitelist: tags: - MagazineLMGAntiMaterielBox + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgeLMGAntiMateriel priority: 1 whitelist: tags: 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 edddca73d28..255619461cf 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -1,6 +1,6 @@ - type: entity name: viper - parent: BaseWeaponPistol + parent: WeaponPistolViper id: WeaponPistolViperWood description: A small, low-power pistol with pleasant lacquered wooden grips. Uses .35 auto ammo. suffix: Wood @@ -9,28 +9,6 @@ sprite: _DV/Objects/Weapons/Guns/Pistols/viperwood.rsi - type: Clothing sprite: _DV/Objects/Weapons/Guns/Pistols/viperwood.rsi - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistol - insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 - whitelist: - tags: - - MagazinePistol - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - type: entity name: Pollock @@ -47,28 +25,6 @@ fireRate: 5 availableModes: - SemiAuto - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistol - insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 - whitelist: - tags: - - MagazinePistol - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - type: entity name: psi-breaker @@ -95,17 +51,13 @@ whitelist: tags: - MagazinePistolSpecial + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgeSpecialLernaea priority: 1 whitelist: tags: - CartridgeSpecial - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - type: entity name: flintlock @@ -167,11 +119,10 @@ whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgePistol priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol - type: entity name: SLP-57 @@ -239,13 +190,13 @@ whitelist: tags: - MagazinePistol + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgePistolRubber priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol - type: entity parent: WeaponPistolSLP57 @@ -263,13 +214,13 @@ whitelist: tags: - MagazinePistol + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgePistolRubber priority: 1 whitelist: tags: - - CartridgePistol + - CartridgePistol - type: entity parent: BaseWeaponPistol @@ -298,9 +249,9 @@ whitelist: tags: - MagazineUniversalMagnum + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgeMagnum priority: 1 whitelist: tags: @@ -322,9 +273,9 @@ whitelist: tags: - MagazineUniversalMagnum + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgeMagnumIncendiary priority: 1 whitelist: tags: @@ -346,9 +297,9 @@ whitelist: tags: - MagazineUniversalMagnum + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgeMagnumRubber priority: 1 whitelist: tags: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index d2646ec7be7..0330c0294f1 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -24,24 +24,6 @@ availableModes: - SemiAuto - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineLightRifle - insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineLightRifle - gun_chamber: - name: Chamber - startingItem: CartridgeLightRifle - priority: 1 - whitelist: - tags: - - CartridgeLightRifle - type: CursorOffsetRequiresWield - type: EyeCursorOffset maxOffset: 2.5 @@ -98,9 +80,9 @@ whitelist: tags: - MagazineCaselessRifle + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgeCaselessRifle priority: 1 whitelist: tags: @@ -155,9 +137,9 @@ whitelist: tags: - MagazineRifle + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgeRifle priority: 1 whitelist: tags: @@ -259,9 +241,9 @@ whitelist: tags: - MagazineRifle + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgeRifleRubber priority: 1 whitelist: tags: diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 03ba641736c..ee5cd8225be 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -25,24 +25,6 @@ soundGunshot: path: /Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistolSubMachineGun - insertSound: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazinePistolSubMachineGun - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - type: MagazineVisuals magState: mag steps: 1 @@ -81,12 +63,7 @@ availableModes: - SemiAuto - FullAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/smg.ogg - defaultDirection: 1, 0 - type: ChamberMagazineAmmoProvider - soundRack: - path: /Audio/Weapons/Guns/Cock/smg_cock.ogg - type: ItemSlots slots: gun_magazine: @@ -101,7 +78,6 @@ whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber - startingItem: CartridgePistol priority: 1 whitelist: tags: