From 48ff61bd0c18a5eeafb9ab699b41e4fd2b1d9724 Mon Sep 17 00:00:00 2001 From: PursuitInAshes Date: Mon, 25 Nov 2024 07:47:54 -0800 Subject: [PATCH] Remove/Revert CD's Cryosystem and related things (#220) * Revert "Cryo update, lost and found implementation (#49)" This reverts commit 4dc1483b91b7c0e7cfcc194e42c8e40e8c130548. * Revert CD's Cryosystem * Fix Test Fail * Hopefully fix test fail --- .../_CD/CryoSleep/AcceptCryoWindow.cs | 60 ------------------ Content.Client/_CD/CryoSleep/CryoSleepEui.cs | 41 ------------ .../Components/LostAndFoundComponent.cs | 7 -- .../_CD/cryosleep/cryosleep-component.ftl | 7 -- .../Entities/Structures/Storage/lockers.yml | 15 ----- .../Storage/closet.rsi/lostandfound.png | Bin 300 -> 0 bytes .../Storage/closet.rsi/lostandfound_door.png | Bin 384 -> 0 bytes .../Storage/closet.rsi/lostandfound_open.png | Bin 310 -> 0 bytes .../Structures/Storage/closet.rsi/meta.json | 11 +--- Resources/migration.yml | 5 +- 10 files changed, 5 insertions(+), 141 deletions(-) delete mode 100644 Content.Client/_CD/CryoSleep/AcceptCryoWindow.cs delete mode 100644 Content.Client/_CD/CryoSleep/CryoSleepEui.cs delete mode 100644 Content.Server/_CD/Storage/Components/LostAndFoundComponent.cs delete mode 100644 Resources/Locale/en-US/_CD/cryosleep/cryosleep-component.ftl delete mode 100644 Resources/Prototypes/_CD/Entities/Structures/Storage/lockers.yml delete mode 100644 Resources/Textures/Structures/Storage/closet.rsi/lostandfound.png delete mode 100644 Resources/Textures/Structures/Storage/closet.rsi/lostandfound_door.png delete mode 100644 Resources/Textures/Structures/Storage/closet.rsi/lostandfound_open.png diff --git a/Content.Client/_CD/CryoSleep/AcceptCryoWindow.cs b/Content.Client/_CD/CryoSleep/AcceptCryoWindow.cs deleted file mode 100644 index 197037937f..0000000000 --- a/Content.Client/_CD/CryoSleep/AcceptCryoWindow.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; -using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Localization; -using static Robust.Client.UserInterface.Controls.BoxContainer; - -namespace Content.Client._CD.CryoSleep; -public sealed class AcceptCryoWindow : DefaultWindow -{ - public readonly Button DenyButton; - public readonly Button AcceptButton; - - public AcceptCryoWindow() - { - - Title = Loc.GetString("accept-cryo-window-title"); - - Contents.AddChild(new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - Children = - { - new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - Children = - { - (new Label() - { - Text = Loc.GetString("accept-cryo-window-prompt-text-part") - }), - new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - Align = AlignMode.Center, - Children = - { - (AcceptButton = new Button - { - Text = Loc.GetString("accept-cryo-window-accept-button"), - }), - - (new Control() - { - MinSize = new Vector2i(20, 0) - }), - - (DenyButton = new Button - { - Text = Loc.GetString("accept-cryo-window-deny-button"), - }) - } - }, - } - }, - } - }); - } -} - diff --git a/Content.Client/_CD/CryoSleep/CryoSleepEui.cs b/Content.Client/_CD/CryoSleep/CryoSleepEui.cs deleted file mode 100644 index 96af73b5d3..0000000000 --- a/Content.Client/_CD/CryoSleep/CryoSleepEui.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Content.Client.Eui; -using Content.Shared._CD.CryoSleep; -using JetBrains.Annotations; -using Robust.Client.Graphics; - -namespace Content.Client._CD.CryoSleep; - -[UsedImplicitly] -public sealed class CryoSleepEui : BaseEui -{ - private readonly AcceptCryoWindow _window; - - public CryoSleepEui() - { - _window = new AcceptCryoWindow(); - - _window.DenyButton.OnPressed += _ => - { - SendMessage(new AcceptCryoChoiceMessage(AcceptCryoUiButton.Deny)); - _window.Close(); - }; - - _window.AcceptButton.OnPressed += _ => - { - SendMessage(new AcceptCryoChoiceMessage(AcceptCryoUiButton.Accept)); - _window.Close(); - }; - } - - public override void Opened() - { - IoCManager.Resolve().RequestWindowAttention(); - _window.OpenCentered(); - } - - public override void Closed() - { - _window.Close(); - } - -} diff --git a/Content.Server/_CD/Storage/Components/LostAndFoundComponent.cs b/Content.Server/_CD/Storage/Components/LostAndFoundComponent.cs deleted file mode 100644 index 8a8db1f2c9..0000000000 --- a/Content.Server/_CD/Storage/Components/LostAndFoundComponent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Server._CD.Storage.Components; - -[RegisterComponent] -public sealed partial class LostAndFoundComponent : Component -{ - -} diff --git a/Resources/Locale/en-US/_CD/cryosleep/cryosleep-component.ftl b/Resources/Locale/en-US/_CD/cryosleep/cryosleep-component.ftl deleted file mode 100644 index a417e94684..0000000000 --- a/Resources/Locale/en-US/_CD/cryosleep/cryosleep-component.ftl +++ /dev/null @@ -1,7 +0,0 @@ -## 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 - -cryo-leave-announcement = {$character} ({$job}) is entering cryosleep. \ No newline at end of file diff --git a/Resources/Prototypes/_CD/Entities/Structures/Storage/lockers.yml b/Resources/Prototypes/_CD/Entities/Structures/Storage/lockers.yml deleted file mode 100644 index b124e00313..0000000000 --- a/Resources/Prototypes/_CD/Entities/Structures/Storage/lockers.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - parent: LockerBaseSecure - id: LockerLostAndFound - name: lost and found locker - components: - - type: LostAndFound - - type: EntityStorage - capacity: 999 # Supposed to fit a lot. - - type: Appearance - - type: EntityStorageVisuals - stateBaseClosed: lostandfound - stateDoorOpen: lostandfound_open - stateDoorClosed: lostandfound_door - - type: AccessReader - access: [["HeadOfPersonnel"]] diff --git a/Resources/Textures/Structures/Storage/closet.rsi/lostandfound.png b/Resources/Textures/Structures/Storage/closet.rsi/lostandfound.png deleted file mode 100644 index 2991a3ced1fe9f0eec91b896937eed82bc35c62e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ&z>%hArY;~2@(khJk~gwo^JTR zM55;P54J^T(iE>1`ObFOlVvsetmLWZ^HN^;n5BDU#hyNJ;J}CZ67B|qj~Swx0@($o zvPl3z-2RF~2M!)=3_tsvKOZE(u}b+S;~JYoJo)eD99#YDO(bWVdN|+V%rLpcMKTT{ zVS$@@e*FJ;Q+5$g3!|f^=%P(Z7XulLr${(-C9~TI_E{xdVN`j_#AcSa$~xhIbHV{x zhaiy;pST5=zO&^_<6A56Ks0N#+RA-9mAwW v4{oe_*I3A)-EYvmKqQk*__mIG0RzMA_lEnu`t?MB-e>T1^>bP0l+XkKDSdFX diff --git a/Resources/Textures/Structures/Storage/closet.rsi/lostandfound_door.png b/Resources/Textures/Structures/Storage/closet.rsi/lostandfound_door.png deleted file mode 100644 index ed87665239714bba2bccb8cfb310761062f896ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmV-`0e}99P)+_+|IzjzyPN|e|Q5|17pJ+N>v9uxp@Z8es*{^UbV=MqM8F> zK*~0iR4sS`3ptik(-9;&06plb;SiFd0NFxng#yWGfZBkhC}3c~?sHhSL#K%WR0#oC zwnL}s=71+x4l`(IXfQmva+u-y^XCjtt{kSX11JGhbHM)n`v=Ye@1NaaczEv~3Qa5^ zITv69x^9UK7S`4bx^5pBEUc{=>t$ z9Uv^PL$+m9aR9y$Af*T<+W|^uJ{V%;SWK1!uq8m4`19v-3{P&JVR-&rj%>$J1ePvc e`X8AdG5`R*&UD)D25=_;0000#TkQLpL#)ilm_trBYQ=u`qezX<1y)@XpfS z_9o}#4NVG2Boe{I!X8!{?d#)g=>5>WZ=mop0H`)QPqU%-sr*pFg#O-P_sMjQOwIy$ z=`V>3vC05GV7s;=7v8=5T7XDoz<&fx2ffGzRaNN&)I^3<@-g6ibj1eLTHVM6&o=1; zc!@O`!kP?8#dnm)!7@g`<%Hm{`-%J|AaE8qA6;Y$WibI-t_Ural_$VXz_U$k=3~-; zr%!R