diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs index b24ede063b..5835c0b4e4 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs @@ -104,27 +104,10 @@ namespace Content.Server.Disposal.Unit.EntitySystems { Act = () => TryEjectContents(component), Category = VerbCategory.Eject, - Text = Loc.GetString("disposal-eject-verb-contents") + Text = Loc.GetString("disposal-eject-verb-get-data-text") }; args.Verbs.Add(ejectVerb); } - - // Behavior if using a trash bag & other dumpable containers - if (args.Using != null - && TryComp(args.Using.Value, out var dumpable) - && TryComp(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 args) diff --git a/Resources/Locale/en-US/disposal/unit/components/disposal-unit-component.ftl b/Resources/Locale/en-US/disposal/unit/components/disposal-unit-component.ftl index c485649316..9f44c31f24 100644 --- a/Resources/Locale/en-US/disposal/unit/components/disposal-unit-component.ftl +++ b/Resources/Locale/en-US/disposal/unit/components/disposal-unit-component.ftl @@ -10,11 +10,10 @@ ui-disposal-unit-button-flush = Flush ui-disposal-unit-button-eject = Eject Contents ui-disposal-unit-button-power = Power -## FlushVerb +## Verbs disposal-flush-verb-get-data-text = Flush - -## SelfInsertVerb disposal-self-insert-verb-get-data-text = Jump inside +disposal-eject-verb-get-data-text = Eject contents ## No hands disposal-unit-no-hands = You don't have hands!