Новые амбиенты и пару песен (#586)

* Фича

* Доделываю

* Sussy update # 1 (#45)

* remove useless field's serialization

* fix: use invariant culture where is possible

* feat: rotatable radars

* feat: menu ref

* tweak: delete useless

* fix

* new

* feat: new ambient system

* add: new lobby audio files

* feat: helmet overlays & HUDs

* fix

* fix

* tweak: add a way to play without RTX

* ooops

* forget

* Revert "forget"

This reverts commit 244cdbe5562d759250697e7b65da2471dd809456.

* privet ya valtos leniviy yeban

* remove: drink delay

* tweak: don't kick player after ban

* fix: shaders

* tweak: ban message

* sus

* oops

Co-authored-by: Игорь Спичкин <55196698+igorsaux@users.noreply.github.com>

* Revert "Sussy update # 1 (#45)"

This reverts commit 810fa91adc76144527f9bb0e4e3f7ccca4ebe697.

* holy shit so many sounds

* proebalis

---------

Co-authored-by: wCATw <leb.beliiii@gmail.com>
Co-authored-by: rhailrake <49613070+rhailrake@users.noreply.github.com>
Co-authored-by: Игорь Спичкин <55196698+igorsaux@users.noreply.github.com>
This commit is contained in:
ThereDrD
2024-08-08 19:57:49 +03:00
committed by GitHub
parent cced3cc98b
commit 48c86bd846
104 changed files with 264 additions and 151 deletions

View File

@@ -31,8 +31,8 @@ public sealed partial class ContentAudioSystem
[Dependency] private readonly RulesSystem _rules = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
private readonly TimeSpan _minAmbienceTime = TimeSpan.FromSeconds(30);
private readonly TimeSpan _maxAmbienceTime = TimeSpan.FromSeconds(60);
private readonly TimeSpan _minAmbienceTime = TimeSpan.FromSeconds(5);
private readonly TimeSpan _maxAmbienceTime = TimeSpan.FromSeconds(10);
private const float AmbientMusicFadeTime = 10f;
private static float _volumeSlider;

View File

@@ -104,7 +104,7 @@ namespace Content.Server.Body.Components
/// The sound to be played when a weapon instantly deals blood loss damage.
/// </summary>
[DataField]
public SoundSpecifier InstantBloodSound = new SoundCollectionSpecifier("blood");
public SoundSpecifier InstantBloodSound = new SoundCollectionSpecifier("BloodLossRun");
/// <summary>
/// The sound to be played when some damage actually heals bleeding rather than starting it.
@@ -181,6 +181,12 @@ namespace Content.Server.Body.Components
/// </summary>
public bool IsBleeding => BleedAmount > 0;
public readonly AudioParams DefaultParams = AudioParams.Default.WithVolume(-1f);
public SoundSpecifier? BloodLossSound = new SoundCollectionSpecifier("BloodLoss");
//public SoundSpecifier? BloodLossRunSound = new SoundCollectionSpecifier("");
//WD-EDIT
}
}

View File

@@ -13,9 +13,12 @@ using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Damage;
using Content.Shared.Damage.Components;
using Content.Shared.Damage.Prototypes;
using Content.Shared.Drunk;
using Content.Shared.FixedPoint;
using Content.Shared.Mobs;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Movement.Systems;
using Content.Shared.Popups;
@@ -44,7 +47,7 @@ public sealed class BloodstreamSystem : EntitySystem
[Dependency] private readonly AlertsSystem _alertsSystem = default!;
[Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
[Dependency] private readonly MovementSpeedModifierSystem _speed = default!; // WD
[Dependency] private readonly BloodLossAccent _bloodLossAccent = default!;
[Dependency] private readonly BloodLossAccent _bloodLossAccent = default!; // WD
public override void Initialize()
{
@@ -383,6 +386,13 @@ public sealed class BloodstreamSystem : EntitySystem
}
tempSolution.RemoveAllSolution();
// WD edit start
if (TryComp<MobStateComponent>(uid, out var mobState) && TryComp<StaminaComponent>(uid, out var stamina))
if (mobState.CurrentState != MobState.Critical && !stamina.Critical)
_audio.PlayPvs(component.BloodLossSound, uid, component.DefaultParams);
// WD edit end
}
_solutionContainerSystem.UpdateChemicals(component.TemporarySolution.Value);

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -40,9 +40,9 @@
- type: AmbientSound
enabled: false
range: 3
volume: -8
volume: -12
sound:
path: /Audio/Ambience/anomaly_drone.ogg
collection: AnomalySounds
- type: GenericVisualizer
visuals:
enum.PowerDeviceVisuals.Powered:

View File

@@ -14,9 +14,9 @@
Radiation: 10
- type: AmbientSound
range: 5
volume: -5
volume: -12
sound:
path: /Audio/Ambience/anomaly_drone.ogg
collection: AnomalySounds
- type: Transform
anchored: false
- type: Physics

Some files were not shown because too many files have changed in this diff Show More