diff --git a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs index 5f5d334c512..103731b1b04 100644 --- a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs +++ b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs @@ -49,7 +49,7 @@ public sealed class CarryingSystem : EntitySystem [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!; [Dependency] private readonly RespiratorSystem _respirator = default!; - [Dependency] private readonly PseudoItemSystem _pseudoItem = default!; // Needed for fitting check + [Dependency] private readonly PseudoItemSystem _pseudoItem = default!; public override void Initialize() { diff --git a/Content.Server/Resist/CanEscapeInventoryComponent.cs b/Content.Server/Resist/CanEscapeInventoryComponent.cs index 3f19c5f6a32..978e03d95f9 100644 --- a/Content.Server/Resist/CanEscapeInventoryComponent.cs +++ b/Content.Server/Resist/CanEscapeInventoryComponent.cs @@ -17,7 +17,7 @@ public sealed partial class CanEscapeInventoryComponent : Component public DoAfterId? DoAfter; /// - /// DeltaV - action to cancel inventory escape. Added dynamically. + /// Action to cancel inventory escape. /// [DataField] public EntityUid? EscapeCancelAction; diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs index ec9990a2c65..95a470e9093 100644 --- a/Content.Server/Resist/EscapeInventorySystem.cs +++ b/Content.Server/Resist/EscapeInventorySystem.cs @@ -26,14 +26,14 @@ public sealed class EscapeInventorySystem : EntitySystem [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly CarryingSystem _carryingSystem = default!; // Carrying system from Nyanotrasen. - [Dependency] private readonly SharedActionsSystem _actions = default!; // DeltaV + [Dependency] private readonly SharedActionsSystem _actions = default!; /// /// You can't escape the hands of an entity this many times more massive than you. /// public const float MaximumMassDisadvantage = 6f; /// - /// DeltaV - action to cancel inventory escape + /// Action to cancel inventory escape /// [ValidatePrototypeId] private readonly string _escapeCancelAction = "ActionCancelEscape"; @@ -45,7 +45,7 @@ public override void Initialize() SubscribeLocalEvent(OnRelayMovement); SubscribeLocalEvent(OnEscape); SubscribeLocalEvent(OnDropped); - SubscribeLocalEvent(OnCancelEscape); // DeltaV + SubscribeLocalEvent(OnCancelEscape); } private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent component, ref MoveInputEvent args) @@ -94,7 +94,7 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen _popupSystem.PopupEntity(Loc.GetString("escape-inventory-component-start-resisting"), user, user); _popupSystem.PopupEntity(Loc.GetString("escape-inventory-component-start-resisting-target"), container, container); - // DeltaV - escape cancel action + // Add an escape cancel action if (component.EscapeCancelAction is not { Valid: true }) _actions.AddAction(user, ref component.EscapeCancelAction, _escapeCancelAction); } @@ -103,7 +103,7 @@ private void OnEscape(EntityUid uid, CanEscapeInventoryComponent component, Esca { component.DoAfter = null; - // DeltaV - remove cancel action regardless of do-after result + // Remove the cancel action regardless of do-after result _actions.RemoveAction(uid, component.EscapeCancelAction); component.EscapeCancelAction = null; @@ -127,7 +127,6 @@ private void OnDropped(EntityUid uid, CanEscapeInventoryComponent component, Dro _doAfterSystem.Cancel(component.DoAfter); } - // DeltaV private void OnCancelEscape(EntityUid uid, CanEscapeInventoryComponent component, EscapeInventoryCancelActionEvent args) { if (component.DoAfter != null) diff --git a/Content.Shared/Resist/EscapeInventoryCancelEvent.cs b/Content.Shared/Resist/EscapeInventoryCancelEvent.cs index a8e6b56f851..75ee09ff045 100644 --- a/Content.Shared/Resist/EscapeInventoryCancelEvent.cs +++ b/Content.Shared/Resist/EscapeInventoryCancelEvent.cs @@ -2,5 +2,4 @@ namespace Content.Shared.Resist; -// DeltaV public sealed partial class EscapeInventoryCancelActionEvent : InstantActionEvent; diff --git a/Resources/Locale/en-US/actions/actions/sleep.ftl b/Resources/Locale/en-US/actions/actions/sleep.ftl index fd833fd4a5c..6188e1639fe 100644 --- a/Resources/Locale/en-US/actions/actions/sleep.ftl +++ b/Resources/Locale/en-US/actions/actions/sleep.ftl @@ -5,3 +5,5 @@ sleep-examined = [color=lightblue]{CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($ wake-other-success = You shake {THE($target)} awake. wake-other-failure = You shake {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} not waking up. + +popup-sleep-in-bag = {THE($entity)} curls up and falls asleep. diff --git a/Resources/Locale/en-US/deltav/actions/sleep.ftl b/Resources/Locale/en-US/deltav/actions/sleep.ftl deleted file mode 100644 index 73e164f556d..00000000000 --- a/Resources/Locale/en-US/deltav/actions/sleep.ftl +++ /dev/null @@ -1 +0,0 @@ -popup-sleep-in-bag = {THE($entity)} curls up and falls asleep. diff --git a/Resources/Prototypes/DeltaV/Entities/Actions/cancel-escape-inventory.yml b/Resources/Prototypes/Actions/misc.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Actions/cancel-escape-inventory.yml rename to Resources/Prototypes/Actions/misc.yml diff --git a/Resources/Textures/DeltaV/Actions/escapeinventory.rsi/cancel-escape.png b/Resources/Textures/Actions/escapeinventory.rsi/cancel-escape.png similarity index 100% rename from Resources/Textures/DeltaV/Actions/escapeinventory.rsi/cancel-escape.png rename to Resources/Textures/Actions/escapeinventory.rsi/cancel-escape.png diff --git a/Resources/Textures/DeltaV/Actions/escapeinventory.rsi/meta.json b/Resources/Textures/Actions/escapeinventory.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Actions/escapeinventory.rsi/meta.json rename to Resources/Textures/Actions/escapeinventory.rsi/meta.json