Skip to content

Make glimmer more HL friendly #1014

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

Closed
Sully669 wants to merge 2 commits into from
Closed

Make glimmer more HL friendly #1014

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c138c39
Readded glimmer danger sounds
Mar 16, 2026
cb1612d
Delete Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSys…
fenndragon Mar 17, 2026
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
6 changes: 3 additions & 3 deletions Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,14 @@ private void OnDestroyed(EntityUid uid, SharedGlimmerReactiveComponent component
if (tier < GlimmerTier.High)
return;

var totalIntensity = (float) (_glimmerSystem.Glimmer * 2);
var slope = (float) (11 - _glimmerSystem.Glimmer / 100);
// var totalIntensity = (float) (_glimmerSystem.Glimmer * 2); // HL
// var slope = (float) (11 - _glimmerSystem.Glimmer / 100);
var maxIntensity = 20;

var removed = (float) _glimmerSystem.Glimmer * _random.NextFloat(0.1f, 0.15f);
_glimmerSystem.Glimmer -= (int) removed;
BeamRandomNearProber(uid, _glimmerSystem.Glimmer / 350, _glimmerSystem.Glimmer / 50);
_explosionSystem.QueueExplosion(uid, "Default", totalIntensity, slope, maxIntensity);
//_explosionSystem.QueueExplosion(uid, "Default", totalIntensity, slope, maxIntensity); // HL
}

private void OnUnanchorAttempt(EntityUid uid, SharedGlimmerReactiveComponent component, UnanchorAttemptEvent args)
Expand Down
28 changes: 14 additions & 14 deletions Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,20 @@
volume: -6
sound: /Audio/Ambience/Objects/prober_hum_low.ogg
- type: AmbientOnPowered
# - type: GlimmerSound
# glimmerTier:
# Minimal:
# path: /Audio/Ambience/Objects/prober_hum_low.ogg
# Low:
# path: /Audio/Ambience/Objects/prober_hum_low.ogg
# Moderate:
# path: /Audio/Ambience/Objects/prober_hum_moderate.ogg
# High:
# path: /Audio/Ambience/Objects/prober_hum_high.ogg
# Dangerous:
# path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
# Critical:
# path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
- type: GlimmerSound
glimmerTier:
Minimal:
path: /Audio/Ambience/Objects/prober_hum_low.ogg
Low:
path: /Audio/Ambience/Objects/prober_hum_low.ogg
Moderate:
path: /Audio/Ambience/Objects/prober_hum_moderate.ogg
High:
path: /Audio/Ambience/Objects/prober_hum_high.ogg
Dangerous:
path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
Critical:
path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg

- type: entity
parent: BaseMachinePowered
Expand Down
Loading