Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Replace VerbTypes with verb classes (#6525)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-10 15:30:59 +13:00
committed by GitHub
parent 0cd2c2fa9d
commit 1c9ffdc78c
60 changed files with 409 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Weapon/Ranged/GunSystem.Magazine.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Server.Weapon.Ranged;
public sealed partial class GunSystem
{
private void AddEjectMagazineVerb(EntityUid uid, MagazineBarrelComponent component, GetAlternativeVerbsEvent args)
private void AddEjectMagazineVerb(EntityUid uid, MagazineBarrelComponent component, GetVerbsEvent<AlternativeVerb> args)
{
if (args.Hands == null ||
!args.CanAccess ||
@@ -34,7 +34,7 @@ public sealed partial class GunSystem
if (component.MagNeedsOpenBolt && !component.BoltOpen)
return;
Verb verb = new()
AlternativeVerb verb = new()
{
Text = MetaData(component.MagazineContainer.ContainedEntity!.Value).EntityName,
Category = VerbCategory.Eject,
@@ -43,7 +43,7 @@ public sealed partial class GunSystem
args.Verbs.Add(verb);
}
private void AddMagazineInteractionVerbs(EntityUid uid, MagazineBarrelComponent component, GetInteractionVerbsEvent args)
private void AddMagazineInteractionVerbs(EntityUid uid, MagazineBarrelComponent component, GetVerbsEvent<InteractionVerb> args)
{
if (args.Hands == null ||
!args.CanAccess ||
@@ -51,7 +51,7 @@ public sealed partial class GunSystem
return;
// Toggle bolt verb
Verb toggleBolt = new()
InteractionVerb toggleBolt = new()
{
Text = component.BoltOpen
? Loc.GetString("close-bolt-verb-get-data-text")
@@ -67,7 +67,7 @@ public sealed partial class GunSystem
return;
// Insert mag verb
Verb insert = new()
InteractionVerb insert = new()
{
Text = MetaData(@using).EntityName,
Category = VerbCategory.Insert,