From a538ff374ec81c5a2d81d288fe6c6bc337d8e697 Mon Sep 17 00:00:00 2001 From: Finket Date: Fri, 19 Jan 2024 20:29:42 +0200 Subject: [PATCH] Fix some naming and spacing uniformity issues --- .../CosmaticDrift/CryoSleep/CryoSleepSystem.cs | 9 +++++---- .../Audio/SimpleStation14/Effects/attributions.yml | 5 +++-- .../{cryosleepopen.ogg => cryosleep_open.ogg} | Bin .../cosmaticdrift/cryosleep/cryosleep-component.ftl | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) rename Resources/Audio/SimpleStation14/Effects/{cryosleepopen.ogg => cryosleep_open.ogg} (100%) diff --git a/Content.Server/CosmaticDrift/CryoSleep/CryoSleepSystem.cs b/Content.Server/CosmaticDrift/CryoSleep/CryoSleepSystem.cs index 2ae82b5597..409b451adb 100644 --- a/Content.Server/CosmaticDrift/CryoSleep/CryoSleepSystem.cs +++ b/Content.Server/CosmaticDrift/CryoSleep/CryoSleepSystem.cs @@ -20,13 +20,11 @@ using Content.Shared.Roles.Jobs; using Content.Shared.StationRecords; using Content.Shared.Verbs; -using Robust.Server.Audio; using Robust.Server.Containers; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.Enums; -using Robust.Shared.Physics; namespace Content.Server.CryoSleep; @@ -53,6 +51,7 @@ public override void Initialize() base.Initialize(); SubscribeLocalEvent(ComponentInit); + SubscribeLocalEvent>(AddAlternativeVerbs); SubscribeLocalEvent((e, c, _) => EjectBody(e, c)); SubscribeLocalEvent(OnDragDrop); @@ -63,6 +62,7 @@ private void ComponentInit(EntityUid uid, CryoSleepComponent component, Componen component.BodyContainer = _container.EnsureContainer(uid, "body_container"); } + private bool InsertBody(EntityUid uid, EntityUid? toInsert, CryoSleepComponent component) { if (toInsert == null || IsOccupied(component)) @@ -79,7 +79,7 @@ private bool InsertBody(EntityUid uid, EntityUid? toInsert, CryoSleepComponent c public bool RespawnUser(EntityUid? toInsert, CryoSleepComponent component, bool force) { // Play the cryosleep pod opening sound effect. - _audioSystem.PlayPvs("/Audio/SimpleStation14/Effects/cryosleepopen.ogg", component.Owner, AudioParams.Default.WithVolume(5f)); + _audioSystem.PlayPvs("/Audio/SimpleStation14/Effects/cryosleep_open.ogg", component.Owner, AudioParams.Default.WithVolume(6f)); if (toInsert == null) return false; @@ -106,6 +106,7 @@ public bool RespawnUser(EntityUid? toInsert, CryoSleepComponent component, bool return success; } + public void CryoStoreBody(EntityUid mindId) { if (!_sharedJobSystem.MindTryGetJob(mindId, out _, out var prototype)) @@ -123,7 +124,7 @@ public void CryoStoreBody(EntityUid mindId) return; // Play the cryostasis sound effect. Need to use coordinates since the body gets deleted. - _audioSystem.PlayPvs("/Audio/SimpleStation14/Effects/cryostasis.ogg", Transform(body.Value).Coordinates, AudioParams.Default.WithVolume(5f)); + _audioSystem.PlayPvs("/Audio/SimpleStation14/Effects/cryostasis.ogg", Transform(body.Value).Coordinates, AudioParams.Default.WithVolume(6f)); // Remove the record. Hopefully. foreach (var item in _inventory.GetHandOrInventoryEntities(body.Value)) diff --git a/Resources/Audio/SimpleStation14/Effects/attributions.yml b/Resources/Audio/SimpleStation14/Effects/attributions.yml index a62f1b325b..2162c64ca3 100644 --- a/Resources/Audio/SimpleStation14/Effects/attributions.yml +++ b/Resources/Audio/SimpleStation14/Effects/attributions.yml @@ -1,4 +1,5 @@ -- files: ["cryostasis", "cryosleepopen"] +- files: ["cryostasis", "cryosleep_open"] license: "CC-BY-SA-3.0" copyright: "Created by Finket for SS14" - source: "https://github.com/Finket/" \ No newline at end of file + source: "https://github.com/Finket/" + diff --git a/Resources/Audio/SimpleStation14/Effects/cryosleepopen.ogg b/Resources/Audio/SimpleStation14/Effects/cryosleep_open.ogg similarity index 100% rename from Resources/Audio/SimpleStation14/Effects/cryosleepopen.ogg rename to Resources/Audio/SimpleStation14/Effects/cryosleep_open.ogg diff --git a/Resources/Locale/en-US/cosmaticdrift/cryosleep/cryosleep-component.ftl b/Resources/Locale/en-US/cosmaticdrift/cryosleep/cryosleep-component.ftl index eaa1be2257..c44f60a8fd 100644 --- a/Resources/Locale/en-US/cosmaticdrift/cryosleep/cryosleep-component.ftl +++ b/Resources/Locale/en-US/cosmaticdrift/cryosleep/cryosleep-component.ftl @@ -1,7 +1,7 @@ ## UI accept-cryo-window-accept-button = Accept accept-cryo-window-deny-button = Cancel -accept-cryo-window-prompt-text-part = Enter cryo sleep and finish your shift as this character? -accept-cryo-window-title = Cryo Sleep Chamber +accept-cryo-window-prompt-text-part = Enter cryosleep and end your shift as this character? +accept-cryo-window-title = Cryostasis Sleep Chamber -cryo-leave-announcement = {$character} ({$job}) is entering cryosleep. +cryo-leave-announcement = {$character} ({$job}) has gone into cryosleep.