From ae3b3b6173da62bb225c0ee128c10f1d58e5e7ab Mon Sep 17 00:00:00 2001 From: Winkarst-cpu <74284083+Winkarst-cpu@users.noreply.github.com> Date: Mon, 7 Jul 2025 18:55:09 +0300 Subject: [PATCH] Cleanup: Remove ``TelephoneComponent.RequiresPower`` (#38823) * Cleanup * Forgot about yml --- Content.Server/Telephone/TelephoneSystem.cs | 2 +- Content.Shared/Telephone/TelephoneComponent.cs | 6 ------ Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs index ab3026fc97..4c87707cc6 100644 --- a/Content.Server/Telephone/TelephoneSystem.cs +++ b/Content.Server/Telephone/TelephoneSystem.cs @@ -490,6 +490,6 @@ public sealed class TelephoneSystem : SharedTelephoneSystem public bool IsTelephonePowered(Entity entity) { - return this.IsPowered(entity, EntityManager) || !entity.Comp.RequiresPower; + return this.IsPowered(entity, EntityManager); } } diff --git a/Content.Shared/Telephone/TelephoneComponent.cs b/Content.Shared/Telephone/TelephoneComponent.cs index c24840ce01..89748d78a4 100644 --- a/Content.Shared/Telephone/TelephoneComponent.cs +++ b/Content.Shared/Telephone/TelephoneComponent.cs @@ -81,12 +81,6 @@ public sealed partial class TelephoneComponent : Component [DataField] public float ListeningRange = 2; - /// - /// Specifies whether this telephone require power to fucntion - /// - [DataField] - public bool RequiresPower = true; - /// /// This telephone should not appear on public telephone directories /// diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index d70c13187f..303f7dc676 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -190,6 +190,7 @@ acts: [ "Destruction" ] - type: ApcPowerReceiver powerLoad: 1000 + needsPower: false - type: StationAiCore - type: StationAiVision - type: InteractionOutline @@ -218,7 +219,6 @@ listeningRange: 0 speakerVolume: Speak unlistedNumber: true - requiresPower: false - type: Holopad - type: StationAiWhitelist - type: UserInterface