From f143dfec077709d83c1acaa8ce3a17f7c6aac320 Mon Sep 17 00:00:00 2001 From: pheenty Date: Sun, 3 Nov 2024 00:00:48 +0700 Subject: [PATCH 1/2] revert --- Content.Shared/Ghost/SharedGhostSystem.cs | 4 ---- .../Entities/Mobs/Player/admin_ghost.yml | 13 ------------- .../Stories/Interface/AdminActions/hide_ghost.png | Bin 653 -> 0 bytes 3 files changed, 17 deletions(-) delete mode 100644 Resources/Textures/Stories/Interface/AdminActions/hide_ghost.png diff --git a/Content.Shared/Ghost/SharedGhostSystem.cs b/Content.Shared/Ghost/SharedGhostSystem.cs index d2e2cd668a..0439d21cce 100644 --- a/Content.Shared/Ghost/SharedGhostSystem.cs +++ b/Content.Shared/Ghost/SharedGhostSystem.cs @@ -66,10 +66,6 @@ public void SetCanReturnToBody(GhostComponent component, bool value) component.CanReturnToBody = value; } - public void SetColor(GhostComponent component, Color value) - { - component.color = value; - } } /// diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index fbc13f6921..995144f5ba 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -17,7 +17,6 @@ context: "aghost" - type: Ghost canInteract: true - - type: HideGhost - type: GhostHearing - type: Hands - type: ComplexInteraction @@ -171,15 +170,3 @@ keywords: [ "AI", "console", "interface" ] priority: -8 event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key } - -- type: entity - id: ActionHideGhost - name: Hide ghost - description: Remove all ways to see your presence - categories: [ HideSpawnMenu ] - components: - - type: InstantAction - icon: Stories/Interface/AdminActions/hide_ghost.png - iconOn: Stories/Interface/AdminActions/hide_ghost.png - event: !type:HideGhostEvent - priority: -10 diff --git a/Resources/Textures/Stories/Interface/AdminActions/hide_ghost.png b/Resources/Textures/Stories/Interface/AdminActions/hide_ghost.png deleted file mode 100644 index f40c6a375267557b21c9ea6d056a96021a388ea3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmV;80&@L{P)Px%M@d9MR9J=WmOo1yaU8}!R|?6IOpam@iQp>`y0`}?Noh>xfCXn?L&k(;a4R}_ zC_1z+pi9xV?;v0xc!@6JB9dH)=hLD7Y!dGhNm4<`v)%pfe$Vs$|AiUeD!SdS&d<*! zNv}@cY&QEyUsXgHS-0E$KO)kw8bt1So(A8!uB*X+Cc-xC6u{3zZjdYpl9Y#B0sL*) znV5VZR0UN)X~+Py+wDLRl9Yx_Cd&gO;PmiNFHJ%K-}eI>)>s0<%FuihRE9ao zzEr@_95_2V;sZDvL`g7DgDXz(_|?hY4&CZ^dcI1X&i; zioX_%7!7mnnd4}x!zgSV8w82?w!5pTjN@Jry$i`8g2wXig9A-vAu$-`!g{?f n1G6Q6KRJ2*O?ieH-YotA1QPB^m%I;C00000NkvXXu0mjfoGL3` From 8e97bf9e0ff0bccd5401202f350845008deaad70 Mon Sep 17 00:00:00 2001 From: pheenty Date: Sun, 3 Nov 2024 00:04:20 +0700 Subject: [PATCH 2/2] delete --- .../Aghost/Actions/HideGhostComponent.cs | 11 ----- .../Admin/Aghost/Actions/HideGhostSystem.cs | 40 ------------------- 2 files changed, 51 deletions(-) delete mode 100644 Content.Shared/Stories/Admin/Aghost/Actions/HideGhostComponent.cs delete mode 100644 Content.Shared/Stories/Admin/Aghost/Actions/HideGhostSystem.cs diff --git a/Content.Shared/Stories/Admin/Aghost/Actions/HideGhostComponent.cs b/Content.Shared/Stories/Admin/Aghost/Actions/HideGhostComponent.cs deleted file mode 100644 index 8d95e582f8..0000000000 --- a/Content.Shared/Stories/Admin/Aghost/Actions/HideGhostComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Content.Shared.Actions; - -namespace Content.Shared.Stories.Admin; - -[RegisterComponent] -public sealed partial class HideGhostComponent : Component -{ -} -public sealed partial class HideGhostEvent : InstantActionEvent -{ -} diff --git a/Content.Shared/Stories/Admin/Aghost/Actions/HideGhostSystem.cs b/Content.Shared/Stories/Admin/Aghost/Actions/HideGhostSystem.cs deleted file mode 100644 index 7bb26df20d..0000000000 --- a/Content.Shared/Stories/Admin/Aghost/Actions/HideGhostSystem.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Ghost; -using Content.Shared.Tag; - -namespace Content.Shared.Stories.Admin; -public sealed class HideGhostSystem : EntitySystem -{ - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedGhostSystem _ghost = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - - private static readonly string HideGhostAction = "ActionHideGhost"; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnStartUp); - SubscribeLocalEvent(OnRemoveGhostColor); - } - private void OnStartUp(EntityUid uid, HideGhostComponent component, ComponentStartup args) - { - if (!TryComp(uid, out var _)) - return; - - _actions.AddAction(uid, HideGhostAction); - } - - private void OnRemoveGhostColor(EntityUid uid, HideGhostComponent component, HideGhostEvent args) - { - if (!TryComp(uid, out var ghost)) - return; - - _ghost.SetColor(ghost, new Color(255, 255, 255, 0)); - _tag.TryAddTag(uid, "HideContextMenu"); - _meta.SetEntityName(uid, ""); - _meta.SetEntityDescription(uid, ""); - } -} -