tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplicate disposal unit verb (#10607)

Browse Source 
* Remove duplicate verb

* also fix missing loc string
This commit is contained in:
Leon Friedrich
2022-08-15 15:58:58 +12:00
committed by GitHub
parent 23670ca1e3
commit 24b21c80f2
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -104,27 +104,10 @@ namespace Content.Server.Disposal.Unit.EntitySystems
{ {
Act = () => TryEjectContents(component), Act = () => TryEjectContents(component),
Category = VerbCategory.Eject, Category = VerbCategory.Eject,
Text = Loc.GetString("disposal-eject-verb-contents") Text = Loc.GetString("disposal-eject-verb-get-data-text")
}; };
args.Verbs.Add(ejectVerb); args.Verbs.Add(ejectVerb);
} }
// Behavior if using a trash bag & other dumpable containers
if (args.Using != null
&& TryComp<DumpableComponent>(args.Using.Value, out var dumpable)
&& TryComp<ServerStorageComponent>(args.Using.Value, out var storage)
&& storage.StoredEntities is { Count: > 0 })
{
// Verb to dump held container into disposal unit
AlternativeVerb dumpVerb = new()
{
Act = () => _dumpableSystem.StartDoAfter(args.Using.Value, args.Target, args.User, dumpable, storage),
Text = Loc.GetString("dump-disposal-verb-name", ("unit", args.Target)),
Priority = 2
};
args.Verbs.Add(dumpVerb);
}
} }
private void AddClimbInsideVerb(EntityUid uid, DisposalUnitComponent component, GetVerbsEvent<Verb> args) private void AddClimbInsideVerb(EntityUid uid, DisposalUnitComponent component, GetVerbsEvent<Verb> args)

5
Resources/Locale/en-US/disposal/unit/components/disposal-unit-component.ftl
View File

@@ -10,11 +10,10 @@ ui-disposal-unit-button-flush = Flush
ui-disposal-unit-button-eject = Eject Contents ui-disposal-unit-button-eject = Eject Contents
ui-disposal-unit-button-power = Power ui-disposal-unit-button-power = Power
## FlushVerb ## Verbs
disposal-flush-verb-get-data-text = Flush disposal-flush-verb-get-data-text = Flush
## SelfInsertVerb
disposal-self-insert-verb-get-data-text = Jump inside disposal-self-insert-verb-get-data-text = Jump inside
disposal-eject-verb-get-data-text = Eject contents
## No hands ## No hands
disposal-unit-no-hands = You don't have hands! disposal-unit-no-hands = You don't have hands!