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

[2 lines] fix blinding (#9690)

Browse Source 
* Adds blinding + blindfolds (#8688)

* Adds blinding + blindfolds

* Don't break examining lol

* moment

* fix toggle lights behavior

* move checks around

* Sloth review

* Added a salvage funny

* review

* woops

* Switch circle shader

Co-authored-by: wrexbe <wrexbe@protonmail.com>

* resolve merge conflict

Co-authored-by: wrexbe <wrexbe@protonmail.com>
This commit is contained in:
Rane
2022-07-14 07:58:24 -04:00
committed by GitHub
parent ef92c351bf
commit 83c03b60a1
21 changed files with 309 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Examine/ExamineSystemShared.cs
View File

@@ -2,6 +2,7 @@ using System.Linq;
using Content.Shared.DragDrop;
using Content.Shared.Interaction;
using Content.Shared.MobState.Components;
using Content.Shared.Eye.Blinding;
using Content.Shared.MobState.EntitySystems;
using JetBrains.Annotations;
using Robust.Shared.Containers;
@@ -98,7 +99,7 @@ namespace Content.Shared.Examine
{
if (MobStateSystem.IsDead(examiner, mobState))
return DeadExamineRange;
else if (MobStateSystem.IsCritical(examiner, mobState))
else if (MobStateSystem.IsCritical(examiner, mobState) || (TryComp<BlindableComponent>(examiner, out var blind) && blind.Sources > 0))
return CritExamineRange;
}
return ExamineRange;