From eb861d173fb9bf1f105b0d0c7db6d663464f7975 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:36:05 +0200 Subject: [PATCH] Wrong magazine popup (#29046) * wrong magazine * a single typo * removed GunSystem solution * magazine misfit warnings --- .../Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs | 1 + Resources/Locale/en-US/weapons/ranged/gun.ftl | 1 + .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 4 ++++ .../Entities/Objects/Weapons/Guns/Rifles/rifles.yml | 4 ++++ .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 6 +++++- .../Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index 503459cefd..20feb2c952 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -76,6 +76,7 @@ public abstract partial class SharedGunSystem args.Handled = true; + // Continuous loading _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.FillDelay, new AmmoFillDoAfterEvent(), used: uid, target: args.Target, eventTarget: uid) { BreakOnMove = true, diff --git a/Resources/Locale/en-US/weapons/ranged/gun.ftl b/Resources/Locale/en-US/weapons/ranged/gun.ftl index fe60f3eed1..31ac7d5bf2 100644 --- a/Resources/Locale/en-US/weapons/ranged/gun.ftl +++ b/Resources/Locale/en-US/weapons/ranged/gun.ftl @@ -6,6 +6,7 @@ gun-selected-mode = Selected {$mode} gun-disabled = You can't use guns! gun-clumsy = The gun blows up in your face! gun-set-fire-mode = Set to {$mode} +gun-magazine-whitelist-fail = That won't fit into the gun! # SelectiveFire gun-SemiAuto = semi-auto diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 8f469f87a9..e14abcc9d1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -47,6 +47,7 @@ whitelist: tags: - MagazinePistol + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgePistol @@ -90,6 +91,7 @@ tags: - MagazinePistol - MagazinePistolHighCapacity + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgePistol @@ -173,6 +175,7 @@ whitelist: tags: - MagazinePistolCaselessRifle + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgeCaselessRifle @@ -243,6 +246,7 @@ whitelist: tags: - MagazineMagnum + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgeMagnum diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index fef793487c..f073d0cb74 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -36,6 +36,7 @@ whitelist: tags: - MagazineLightRifle + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgeLightRifle @@ -81,6 +82,7 @@ whitelist: tags: - MagazineLightRifle + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgeLightRifle @@ -124,6 +126,7 @@ whitelist: tags: - MagazineRifle + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgeRifle @@ -170,6 +173,7 @@ whitelist: tags: - MagazineRifle + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgeRifle diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index b86356306c..e7f0ce4bff 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -41,6 +41,7 @@ whitelist: tags: - MagazinePistolSubMachineGun + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgePistol @@ -100,7 +101,7 @@ maxAngle: -16 - type: Gun minAngle: 21 - maxAngle: 32 + maxAngle: 32 shotsPerBurst: 5 availableModes: - SemiAuto @@ -156,6 +157,7 @@ whitelist: tags: - MagazinePistolSubMachineGun + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgePistol @@ -210,6 +212,7 @@ whitelist: tags: - CartridgeMagnum + whitelistFailPopup: gun-magazine-whitelist-fail - type: MagazineVisuals magState: mag steps: 1 @@ -262,6 +265,7 @@ whitelist: tags: - MagazinePistolSubMachineGunTopMounted + whitelistFailPopup: gun-magazine-whitelist-fail gun_chamber: name: Chamber startingItem: CartridgePistol diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index b8cd6b8b25..6e81bc3be2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -85,6 +85,7 @@ whitelist: tags: - MagazineShotgun + whitelistFailPopup: gun-magazine-whitelist-fail insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg - type: ContainerContainer -- 2.51.2