From 51c06a361340bce27a19d30a73dfb44ed0568159 Mon Sep 17 00:00:00 2001 From: null <56081759+NullWanderer@users.noreply.github.com> Date: Sat, 18 May 2024 13:37:43 +0200 Subject: [PATCH] Revert "Fix prescription glasses working from pockets (#286)" This reverts commit 168699d23a8f60d9efd77e40c1a35ab43010ae1e. --- .../Overlays/Systems/NearsightedSystems.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Content.Client/SimpleStation14/Overlays/Systems/NearsightedSystems.cs b/Content.Client/SimpleStation14/Overlays/Systems/NearsightedSystems.cs index dedb067429c..ef413ec65d3 100644 --- a/Content.Client/SimpleStation14/Overlays/Systems/NearsightedSystems.cs +++ b/Content.Client/SimpleStation14/Overlays/Systems/NearsightedSystems.cs @@ -32,21 +32,15 @@ public sealed class NearsightedSystem : EntitySystem private void OnEquip(GotEquippedEvent args) { - // Note: it would be cleaner to check if the glasses are being equipped - // to the eyes rather than the pockets using `args.SlotFlags.HasFlag(SlotFlags.EYES)`, - // but this field is not present on GotUnequippedEvent. This method is - // used for both equip and unequip to make it consistent between checks. if (TryComp(args.Equipee, out var nearsighted) && - EnsureComp(args.Equipment).Tags.Contains("GlassesNearsight") && - args.Slot == "eyes") + EnsureComp(args.Equipment).Tags.Contains("GlassesNearsight")) UpdateShader(nearsighted, true); } private void OnUnEquip(GotUnequippedEvent args) { if (TryComp(args.Equipee, out var nearsighted) && - EnsureComp(args.Equipment).Tags.Contains("GlassesNearsight") && - args.Slot == "eyes") + EnsureComp(args.Equipment).Tags.Contains("GlassesNearsight")) UpdateShader(nearsighted, false); }