New sounds for diseases (#7250)
This commit is contained in:
@@ -1,5 +1,9 @@
|
|||||||
using Content.Shared.Disease;
|
using Content.Shared.Disease;
|
||||||
using JetBrains.Annotations;
|
using JetBrains.Annotations;
|
||||||
|
using Content.Shared.Sound;
|
||||||
|
using Content.Shared.Audio;
|
||||||
|
using Robust.Shared.Audio;
|
||||||
|
using Robust.Shared.Player;
|
||||||
|
|
||||||
namespace Content.Server.Disease
|
namespace Content.Server.Disease
|
||||||
{
|
{
|
||||||
@@ -15,14 +19,22 @@ namespace Content.Server.Disease
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[DataField("snoughMessage")]
|
[DataField("snoughMessage")]
|
||||||
public string SnoughMessage = "disease-sneeze";
|
public string SnoughMessage = "disease-sneeze";
|
||||||
|
|
||||||
|
/// </summary>
|
||||||
|
/// Sound to play when snoughing
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether to spread the disease throught he air
|
[DataField("snoughSound")]
|
||||||
|
public SoundSpecifier? SnoughSound;
|
||||||
|
/// <summary>
|
||||||
|
/// Whether to spread the disease through the air
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[DataField("airTransmit")]
|
[DataField("airTransmit")]
|
||||||
public bool AirTransmit = true;
|
public bool AirTransmit = true;
|
||||||
|
|
||||||
public override void Effect(DiseaseEffectArgs args)
|
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);
|
EntitySystem.Get<DiseaseSystem>().SneezeCough(args.DiseasedEntity, args.Disease, SnoughMessage, AirTransmit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,8 @@ public sealed class DiseaseOutbreak : StationEvent
|
|||||||
};
|
};
|
||||||
public override string Name => "DiseaseOutbreak";
|
public override string Name => "DiseaseOutbreak";
|
||||||
public override float Weight => WeightNormal;
|
public override float Weight => WeightNormal;
|
||||||
|
|
||||||
|
public override string? StartAudio => "/Audio/Announcements/outbreak7.ogg";
|
||||||
protected override float EndAfter => 1.0f;
|
protected override float EndAfter => 1.0f;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Finds 2-5 random, alive entities that can host diseases
|
/// 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);
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1
Resources/Audio/Announcements/license.txt
Normal file
1
Resources/Audio/Announcements/license.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
outbreak7.ogg taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a
|
||||||
BIN
Resources/Audio/Announcements/outbreak7.ogg
Normal file
BIN
Resources/Audio/Announcements/outbreak7.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Effects/Diseases/beepboop.ogg
Normal file
BIN
Resources/Audio/Effects/Diseases/beepboop.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Effects/Diseases/cough1.ogg
Normal file
BIN
Resources/Audio/Effects/Diseases/cough1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Effects/Diseases/cough2.ogg
Normal file
BIN
Resources/Audio/Effects/Diseases/cough2.ogg
Normal file
Binary file not shown.
7
Resources/Audio/Effects/Diseases/license.txt
Normal file
7
Resources/Audio/Effects/Diseases/license.txt
Normal 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/
|
||||||
BIN
Resources/Audio/Effects/Diseases/monkey1.ogg
Normal file
BIN
Resources/Audio/Effects/Diseases/monkey1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Effects/Diseases/monkey2.ogg
Normal file
BIN
Resources/Audio/Effects/Diseases/monkey2.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Effects/Diseases/sneeze1.ogg
Normal file
BIN
Resources/Audio/Effects/Diseases/sneeze1.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Effects/Diseases/sneeze2.ogg
Normal file
BIN
Resources/Audio/Effects/Diseases/sneeze2.ogg
Normal file
Binary file not shown.
@@ -4,6 +4,7 @@ disease-sneeze = {CAPITALIZE($person)} sneezes.
|
|||||||
disease-cough = {CAPITALIZE($person)} coughs.
|
disease-cough = {CAPITALIZE($person)} coughs.
|
||||||
disease-screech = {CAPITALIZE($person)} screeches.
|
disease-screech = {CAPITALIZE($person)} screeches.
|
||||||
disease-meow = {CAPITALIZE($person)} meows.
|
disease-meow = {CAPITALIZE($person)} meows.
|
||||||
|
disease-hiss = {CAPITALIZE($person)} hisses.
|
||||||
disease-beep= {CAPITALIZE($person)} beeps.
|
disease-beep= {CAPITALIZE($person)} beeps.
|
||||||
disease-eaten-inside = You feel like you're being eaten from the inside.
|
disease-eaten-inside = You feel like you're being eaten from the inside.
|
||||||
disease-steal-compulsion = You want to steal things.
|
disease-steal-compulsion = You want to steal things.
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
@@ -11,6 +11,8 @@
|
|||||||
probability: 0.025
|
probability: 0.025
|
||||||
- !type:DiseaseSnough
|
- !type:DiseaseSnough
|
||||||
probability: 0.025
|
probability: 0.025
|
||||||
|
snoughSound:
|
||||||
|
collection: Sneezes
|
||||||
cures:
|
cures:
|
||||||
- !type:DiseaseBedrestCure
|
- !type:DiseaseBedrestCure
|
||||||
maxLength: 20
|
maxLength: 20
|
||||||
@@ -31,6 +33,8 @@
|
|||||||
- !type:DiseaseSnough
|
- !type:DiseaseSnough
|
||||||
probability: 0.025
|
probability: 0.025
|
||||||
snoughMessage: disease-cough
|
snoughMessage: disease-cough
|
||||||
|
snoughSound:
|
||||||
|
collection: Coughs
|
||||||
- !type:DiseaseHealthChange
|
- !type:DiseaseHealthChange
|
||||||
probability: 0.015
|
probability: 0.015
|
||||||
damage:
|
damage:
|
||||||
@@ -56,6 +60,8 @@
|
|||||||
- !type:DiseaseSnough
|
- !type:DiseaseSnough
|
||||||
probability: 0.02
|
probability: 0.02
|
||||||
snoughMessage: disease-beep
|
snoughMessage: disease-beep
|
||||||
|
snoughSound:
|
||||||
|
collection: RobotBeeps
|
||||||
cures:
|
cures:
|
||||||
- !type:DiseaseJustWaitCure
|
- !type:DiseaseJustWaitCure
|
||||||
maxLength: 900
|
maxLength: 900
|
||||||
@@ -77,6 +83,8 @@
|
|||||||
- !type:DiseaseSnough
|
- !type:DiseaseSnough
|
||||||
probability: 0.02
|
probability: 0.02
|
||||||
snoughMessage: disease-screech
|
snoughMessage: disease-screech
|
||||||
|
snoughSound:
|
||||||
|
collection: MonkeyScreeches
|
||||||
- !type:DiseaseGenericStatusEffect
|
- !type:DiseaseGenericStatusEffect
|
||||||
probability: 0.3
|
probability: 0.3
|
||||||
key: Stutter
|
key: Stutter
|
||||||
@@ -128,8 +136,15 @@
|
|||||||
reagent: Ephedrine
|
reagent: Ephedrine
|
||||||
amount: 1
|
amount: 1
|
||||||
- !type:DiseaseSnough
|
- !type:DiseaseSnough
|
||||||
probability: 0.02
|
probability: 0.01
|
||||||
snoughMessage: disease-meow
|
snoughMessage: disease-meow
|
||||||
|
snoughSound:
|
||||||
|
collection: CatMeows
|
||||||
|
- !type:DiseaseSnough
|
||||||
|
probability: 0.01
|
||||||
|
snoughMessage: disease-hiss
|
||||||
|
snoughSound:
|
||||||
|
collection: CatHisses
|
||||||
cures:
|
cures:
|
||||||
- !type:DiseaseBodyTemperatureCure
|
- !type:DiseaseBodyTemperatureCure
|
||||||
min: 420 ## Reachable with a flamer
|
min: 420 ## Reachable with a flamer
|
||||||
|
|||||||
32
Resources/Prototypes/SoundCollections/disease.yml
Normal file
32
Resources/Prototypes/SoundCollections/disease.yml
Normal 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
|
||||||
Reference in New Issue
Block a user