tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

telescreen and television require vision + Move eye to shared (#30260)

Browse Source 
* telescreen and television require vision

* Move Content.Server.Eye to Shared

* fix popups

* Filthy
This commit is contained in:
Cojoke
2024-07-22 21:33:41 -05:00
committed by GitHub
parent 851a0e15a7
commit 2d4aaa414f
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Eye/Blinding/ActivatableUIRequiresVisionComponent.cs → Content.Shared/Eye/Blinding/Components/ActivatableUIRequiresVisionComponent.cs
View File

@@ -1,8 +1,6 @@
namespace Content.Server.Eye.Blinding namespace Content.Shared.Eye.Blinding.Components
{ {
[RegisterComponent] [RegisterComponent]
public sealed partial class ActivatableUIRequiresVisionComponent : Component public sealed partial class ActivatableUIRequiresVisionComponent : Component;
{
}
} }

14
Content.Server/Eye/Blinding/ActivatableUIRequiresVisionSystem.cs → Content.Shared/Eye/Blinding/Systems/ActivatableUIRequiresVisionSystem.cs
View File

@@ -1,18 +1,14 @@
using Content.Shared.Eye.Blinding;
using Content.Shared.UserInterface; using Content.Shared.UserInterface;
using Content.Server.Popups;
using Content.Shared.Eye.Blinding.Components; using Content.Shared.Eye.Blinding.Components;
using Content.Shared.Eye.Blinding.Systems; using Content.Shared.Popups;
using Robust.Shared.Player;
using Robust.Server.GameObjects;
using Robust.Shared.Collections; using Robust.Shared.Collections;
namespace Content.Server.Eye.Blinding; namespace Content.Shared.Eye.Blinding.Systems;
public sealed class ActivatableUIRequiresVisionSystem : EntitySystem public sealed class ActivatableUIRequiresVisionSystem : EntitySystem
{ {
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private readonly SharedUserInterfaceSystem _userInterfaceSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -28,7 +24,7 @@ public sealed class ActivatableUIRequiresVisionSystem : EntitySystem
if (TryComp<BlindableComponent>(args.User, out var blindable) && blindable.IsBlind) if (TryComp<BlindableComponent>(args.User, out var blindable) && blindable.IsBlind)
{ {
_popupSystem.PopupCursor(Loc.GetString("blindness-fail-attempt"), args.User, Shared.Popups.PopupType.MediumCaution); _popupSystem.PopupClient(Loc.GetString("blindness-fail-attempt"), args.User, Shared.Popups.PopupType.MediumCaution);
args.Cancel(); args.Cancel();
} }
} }

4
Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs → Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs
View File

@@ -1,11 +1,10 @@
using Content.Shared.StatusEffect; using Content.Shared.StatusEffect;
using Content.Shared.Inventory; using Content.Shared.Inventory;
using Content.Shared.Eye.Blinding.Components; using Content.Shared.Eye.Blinding.Components;
using Content.Shared.Eye.Blinding.Systems;
using Content.Shared.Tools.Components; using Content.Shared.Tools.Components;
using Content.Shared.Item.ItemToggle.Components; using Content.Shared.Item.ItemToggle.Components;
namespace Content.Server.Eye.Blinding.EyeProtection namespace Content.Shared.Eye.Blinding.Systems
{ {
public sealed class EyeProtectionSystem : EntitySystem public sealed class EyeProtectionSystem : EntitySystem
{ {
@@ -58,6 +57,7 @@ namespace Content.Server.Eye.Blinding.EyeProtection
private void OnWelderToggled(EntityUid uid, RequiresEyeProtectionComponent component, ItemToggledEvent args) private void OnWelderToggled(EntityUid uid, RequiresEyeProtectionComponent component, ItemToggledEvent args)
{ {
component.Toggled = args.Activated; component.Toggled = args.Activated;
Dirty(uid, component);
} }
} }
} }

2
Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
View File

@@ -108,6 +108,7 @@
- type: ActivatableUI - type: ActivatableUI
key: enum.SurveillanceCameraMonitorUiKey.Key key: enum.SurveillanceCameraMonitorUiKey.Key
- type: ActivatableUIRequiresPower - type: ActivatableUIRequiresPower
- type: ActivatableUIRequiresVision
- type: UserInterface - type: UserInterface
interfaces: interfaces:
enum.SurveillanceCameraMonitorUiKey.Key: enum.SurveillanceCameraMonitorUiKey.Key:
@@ -167,6 +168,7 @@
- type: ActivatableUI - type: ActivatableUI
key: enum.SurveillanceCameraMonitorUiKey.Key key: enum.SurveillanceCameraMonitorUiKey.Key
- type: ActivatableUIRequiresPower - type: ActivatableUIRequiresPower
- type: ActivatableUIRequiresVision
- type: UserInterface - type: UserInterface
interfaces: interfaces:
enum.SurveillanceCameraMonitorUiKey.Key: enum.SurveillanceCameraMonitorUiKey.Key: