Make forcing others into disposals take longer and more apparent (#20687)

diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 41db7b1dd898884a926469e8ef1cd06db7187478..baec99b6a57e755dba38d24ec4f5eaf7436d263a 100644 (file)
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -19,6 +19,7 @@ using Content.Shared.DragDrop;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Movement.Events;
@@ -489,7 +490,12 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
         if (!CanInsert(unitId, unit, toInsertId))
             return false;
 
-        var delay = userId == toInsertId ? unit.EntryDelay : unit.DraggedEntryDelay;
+        bool insertingSelf = userId == toInsertId;
+
+        var delay = insertingSelf ? unit.EntryDelay : unit.DraggedEntryDelay;
+
+        if (userId != null && !insertingSelf)
+            _popupSystem.PopupEntity(Loc.GetString("disposal-unit-being-inserted", ("user", Identity.Entity((EntityUid) userId, EntityManager))), toInsertId, toInsertId, PopupType.Large);
 
         if (delay <= 0 || userId == null)
         {

diff --git a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
index 4b867c639f1588110301f05ccf95342789be1e80..e1b78de5cd33026b1aa067a87941a32c99f8f28b 100644 (file)
--- a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
@@ -81,7 +81,7 @@ public abstract partial class SharedDisposalUnitComponent : Component
     ///     Delay from trying to shove someone else into disposals.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public float DraggedEntryDelay = 0.5f;
+    public float DraggedEntryDelay = 2.0f;
 
     /// <summary>
     ///     Container of entities inside this disposal unit.

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 60854b8254dc70e3b5b37ac28dfd973eb926500e..288db53668ffe13730825764b477a793933e8ac0 100644 (file)
--- a/Resources/Locale/en-US/disposal/unit/components/disposal-unit-component.ftl
+++ b/Resources/Locale/en-US/disposal/unit/components/disposal-unit-component.ftl
@@ -26,3 +26,6 @@ disposal-unit-state-Ready = Ready
 # Yes I want it to always say Pressurizing
 disposal-unit-state-Flushed = Pressurizing
 disposal-unit-state-Pressurizing = Pressurizing
+
+# putting people in
+disposal-unit-being-inserted = {CAPITALIZE($user)} is trying to force you into a disposal chute!