diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs index d8fcddc4ed..db7350e35f 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs @@ -15,7 +15,7 @@ public abstract partial class SharedGunSystem protected virtual void InitializeChamberMagazine() { SubscribeLocalEvent(OnChamberMagazineTakeAmmo); - SubscribeLocalEvent>(OnMagazineVerb); + SubscribeLocalEvent>(OnMagazineVerb); SubscribeLocalEvent(OnMagazineSlotChange); SubscribeLocalEvent(OnMagazineSlotChange); SubscribeLocalEvent(OnMagazineUse); diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs index 16095e477f..cabd0d0683 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs @@ -14,7 +14,7 @@ public abstract partial class SharedGunSystem protected virtual void InitializeMagazine() { SubscribeLocalEvent(OnMagazineTakeAmmo); - SubscribeLocalEvent>(OnMagazineVerb); + SubscribeLocalEvent>(OnMagazineVerb); SubscribeLocalEvent(OnMagazineSlotChange); SubscribeLocalEvent(OnMagazineSlotChange); SubscribeLocalEvent(OnMagazineUse); @@ -41,7 +41,7 @@ public abstract partial class SharedGunSystem UpdateMagazineAppearance(component, magEnt.Value); } - private void OnMagazineVerb(EntityUid uid, MagazineAmmoProviderComponent component, GetVerbsEvent args) + private void OnMagazineVerb(EntityUid uid, MagazineAmmoProviderComponent component, GetVerbsEvent args) { if (!args.CanInteract || !args.CanAccess) return; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs index f124df3b1e..8f9a2475bb 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs @@ -21,7 +21,7 @@ public partial class SharedGunSystem SubscribeLocalEvent(OnRevolverHandleState); SubscribeLocalEvent(OnRevolverInit); SubscribeLocalEvent(OnRevolverTakeAmmo); - SubscribeLocalEvent>(OnRevolverVerbs); + SubscribeLocalEvent>(OnRevolverVerbs); SubscribeLocalEvent(OnRevolverInteractUsing); SubscribeLocalEvent(OnRevolverGetAmmoCount); } @@ -166,18 +166,19 @@ public partial class SharedGunSystem return false; } - private void OnRevolverVerbs(EntityUid uid, RevolverAmmoProviderComponent component, GetVerbsEvent args) + private void OnRevolverVerbs(EntityUid uid, RevolverAmmoProviderComponent component, GetVerbsEvent args) { if (!args.CanAccess || !args.CanInteract || args.Hands == null) return; - args.Verbs.Add(new Verb() + args.Verbs.Add(new AlternativeVerb() { Text = Loc.GetString("gun-revolver-empty"), Disabled = !AnyRevolverCartridges(component), - Act = () => EmptyRevolver(component, args.User) + Act = () => EmptyRevolver(component, args.User), + Priority = 1 }); - args.Verbs.Add(new Verb() + args.Verbs.Add(new AlternativeVerb() { Text = Loc.GetString("gun-revolver-spin"), // Category = VerbCategory.G, diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 598e7f82ec..874447a720 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -58,6 +58,7 @@ - id: BoxForensicPad - id: WeaponRevolverInspector - id: DrinkDetFlask + - id: SpeedLoaderMagnum - type: entity id: ClosetBombFilled