Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert Nightvision To Working Code #1721

Closed
wants to merge 10 commits into from
Closed

Revert Nightvision To Working Code #1721

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8a12f00
Also fix thermographic vision
VMSolidus Jan 26, 2025
ea568c3
Update SwitchableOverlaySystem.cs
VMSolidus Jan 26, 2025
21bb730
More fixing
VMSolidus Jan 26, 2025
cdb9fd8
Lol whoops
VMSolidus Jan 26, 2025
e9267c5
More work on fixing this crap
VMSolidus Jan 26, 2025
bb46fa0
Revert "More work on fixing this crap"
VMSolidus Feb 6, 2025
193d09e
Revert "More fixing"
VMSolidus Feb 6, 2025
d883d6a
Revert "Update SwitchableOverlaySystem.cs"
VMSolidus Feb 6, 2025
c1af1a0
Fully Revert To Working Nightvision
VMSolidus Feb 6, 2025
b138f91
Merge branch 'master' into Revert-CyberEyes
VMSolidus Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,10 @@

while (query.MoveNext(out var uid, out var comp))
{
if (comp.PulseTime <= 0)
continue;

// The accumulator is for visually rendering the pulse strength decaying.
comp.PulseAccumulator += comp.PulseEndTime - _timing.CurTime;
if (comp.PulseTime <= 0f || comp.PulseAccumulator >= comp.PulseTime)

Check failure on line 53 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter 

Operator '>=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 53 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter 

Operator '>=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 53 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '>=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 53 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '>=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 53 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '>=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 53 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '>=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 53 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging 

Operator '>=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 53 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging 

Operator '>=' cannot be applied to operands of type 'TimeSpan' and 'float'

// This line is for the actual check that shuts off the pulse when its time is up.
if (_timing.CurTime < comp.PulseEndTime)
comp.PulseAccumulator += frameTime;

Check failure on line 55 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter 

Operator '+=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 55 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter 

Operator '+=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 55 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '+=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 55 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '+=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 55 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '+=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 55 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '+=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 55 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging 

Operator '+=' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 55 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging 

Operator '+=' cannot be applied to operands of type 'TimeSpan' and 'float'
if (comp.PulseAccumulator < comp.PulseTime)

Check failure on line 56 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter 

Operator '<' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 56 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / YAML Linter 

Operator '<' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 56 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '<' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 56 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '<' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 56 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '<' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 56 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

Operator '<' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 56 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging 

Operator '<' cannot be applied to operands of type 'TimeSpan' and 'float'

Check failure on line 56 in Content.Shared/Overlays/Switchable/SwitchableOverlaySystem.cs

View workflow job for this annotation

GitHub Actions / Test Packaging 

Operator '<' cannot be applied to operands of type 'TimeSpan' and 'float'
continue;

Toggle(uid, comp, false, false);
Expand Down
Loading