New sounds for diseases (#7250)

This commit is contained in:
Rane
2022-03-28 19:11:45 -04:00
committed by GitHub
parent 6dfa4c0fef
commit 48fb4debc8
16 changed files with 75 additions and 4 deletions

View File

@@ -1,5 +1,9 @@
using Content.Shared.Disease;
using JetBrains.Annotations;
using Content.Shared.Sound;
using Content.Shared.Audio;
using Robust.Shared.Audio;
using Robust.Shared.Player;
namespace Content.Server.Disease
{
@@ -15,14 +19,22 @@ namespace Content.Server.Disease
/// </summary>
[DataField("snoughMessage")]
public string SnoughMessage = "disease-sneeze";
/// </summary>
/// Sound to play when snoughing
/// <summary>
/// Whether to spread the disease throught he air
[DataField("snoughSound")]
public SoundSpecifier? SnoughSound;
/// <summary>
/// Whether to spread the disease through the air
/// </summary>
[DataField("airTransmit")]
public bool AirTransmit = true;
public override void Effect(DiseaseEffectArgs args)
{
if (SnoughSound != null)
SoundSystem.Play(Filter.Pvs(args.DiseasedEntity), SnoughSound.GetSound(), args.DiseasedEntity, AudioHelpers.WithVariation(0.2f));
EntitySystem.Get<DiseaseSystem>().SneezeCough(args.DiseasedEntity, args.Disease, SnoughMessage, AirTransmit);
}
}

View File

@@ -31,6 +31,8 @@ public sealed class DiseaseOutbreak : StationEvent
};
public override string Name => "DiseaseOutbreak";
public override float Weight => WeightNormal;
public override string? StartAudio => "/Audio/Announcements/outbreak7.ogg";
protected override float EndAfter => 1.0f;
/// <summary>
/// Finds 2-5 random, alive entities that can host diseases
@@ -65,6 +67,7 @@ public sealed class DiseaseOutbreak : StationEvent
diseaseSystem.TryAddDisease(target.Owner, disease, target);
}
_chatManager.DispatchStationAnnouncement(Loc.GetString("station-event-disease-outbreak-announcement"));
_chatManager.DispatchStationAnnouncement(Loc.GetString("station-event-disease-outbreak-announcement"),
playDefaultSound: false, colorOverride: Color.YellowGreen);
}
}

View File

@@ -0,0 +1 @@
outbreak7.ogg taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,7 @@
cough1.ogg taken from freesound (deleted user)
cough2.ogg taken from https://freesound.org/people/Harris85/sounds/208761/
sneeze.ogg taken from https://freesound.org/people/sherby168/sounds/540771/
beepboop.ogg taken from https://freesound.org/people/Fidjo20/sounds/503526/
monkey1.ogg taken from https://freesound.org/people/TRAVELcandies/sounds/423396/
monkey2.ogg taken from https://freesound.org/people/Archeos/sounds/325549/
sneeze2.ogg taken from https://freesound.org/people/InspectorJ/sounds/352177/

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -4,6 +4,7 @@ disease-sneeze = {CAPITALIZE($person)} sneezes.
disease-cough = {CAPITALIZE($person)} coughs.
disease-screech = {CAPITALIZE($person)} screeches.
disease-meow = {CAPITALIZE($person)} meows.
disease-hiss = {CAPITALIZE($person)} hisses.
disease-beep= {CAPITALIZE($person)} beeps.
disease-eaten-inside = You feel like you're being eaten from the inside.
disease-steal-compulsion = You want to steal things.

View File

@@ -1 +1 @@
station-event-disease-outbreak-announcement = Ship systems have detected that some crewmates have been infected with a disease.
station-event-disease-outbreak-announcement = Confirmed outbreak of level 7 biohazard aboard the station. All personnel must contain the outbreak.

View File

@@ -11,6 +11,8 @@
probability: 0.025
- !type:DiseaseSnough
probability: 0.025
snoughSound:
collection: Sneezes
cures:
- !type:DiseaseBedrestCure
maxLength: 20
@@ -31,6 +33,8 @@
- !type:DiseaseSnough
probability: 0.025
snoughMessage: disease-cough
snoughSound:
collection: Coughs
- !type:DiseaseHealthChange
probability: 0.015
damage:
@@ -56,6 +60,8 @@
- !type:DiseaseSnough
probability: 0.02
snoughMessage: disease-beep
snoughSound:
collection: RobotBeeps
cures:
- !type:DiseaseJustWaitCure
maxLength: 900
@@ -77,6 +83,8 @@
- !type:DiseaseSnough
probability: 0.02
snoughMessage: disease-screech
snoughSound:
collection: MonkeyScreeches
- !type:DiseaseGenericStatusEffect
probability: 0.3
key: Stutter
@@ -128,8 +136,15 @@
reagent: Ephedrine
amount: 1
- !type:DiseaseSnough
probability: 0.02
probability: 0.01
snoughMessage: disease-meow
snoughSound:
collection: CatMeows
- !type:DiseaseSnough
probability: 0.01
snoughMessage: disease-hiss
snoughSound:
collection: CatHisses
cures:
- !type:DiseaseBodyTemperatureCure
min: 420 ## Reachable with a flamer

View File

@@ -0,0 +1,32 @@
- type: soundCollection
id: Sneezes
files:
- /Audio/Effects/Diseases/sneeze1.ogg
- /Audio/Effects/Diseases/sneeze2.ogg
- type: soundCollection
id: Coughs
files:
- /Audio/Effects/Diseases/cough1.ogg
- /Audio/Effects/Diseases/cough2.ogg
- type: soundCollection
id: CatMeows
files:
- /Audio/Animals/cat_meow.ogg
- type: soundCollection
id: CatHisses
files:
- /Audio/Animals/cat_hiss.ogg
- type: soundCollection
id: MonkeyScreeches
files:
- /Audio/Effects/Diseases/monkey1.ogg
- /Audio/Effects/Diseases/monkey2.ogg
- type: soundCollection
id: RobotBeeps
files:
- /Audio/Effects/Diseases/beepboop.ogg