Cooler zombie moths (#21744)

This commit is contained in:
Simon
2023-12-11 04:17:55 +01:00
committed by GitHub
parent e1c935871d
commit bd3bea176c
6 changed files with 48 additions and 3 deletions

View File

@@ -0,0 +1,11 @@
namespace Content.Server.Zombies;
/// <summary>
/// Overrides the applied accent for zombies.
/// </summary>
[RegisterComponent]
public sealed partial class ZombieAccentOverrideComponent : Component
{
[DataField("accent")]
public string Accent = "zombie";
}

View File

@@ -103,7 +103,11 @@ namespace Content.Server.Zombies
RemComp<ThirstComponent>(target);
//funny voice
EnsureComp<ReplacementAccentComponent>(target).Accent = "zombie";
var accentType = "zombie";
if (TryComp<ZombieAccentOverrideComponent>(target, out var accent))
accentType = accent.Accent;
EnsureComp<ReplacementAccentComponent>(target).Accent = accentType;
//This is needed for stupid entities that fuck up combat mode component
//in an attempt to make an entity not attack. This is the easiest way to do it.

View File

@@ -52,6 +52,14 @@ accent-words-zombie-8 = Braughhh...
accent-words-zombie-9 = Breshhhh...
accent-words-zombie-10 = Graaaaaa...
# Moth Zombie
accent-words-zombie-moth-1 = Clothessss...
accent-words-zombie-moth-2 = Shooooesss...
accent-words-zombie-moth-3 = Liiiiight...
accent-words-zombie-moth-4 = Laaamps...
accent-words-zombie-moth-5 = Haaaatsss... Hatttssss...
accent-words-zombie-moth-6 = Scarffsss...
# Generic Aggressive
accent-words-generic-aggressive-1 = Grr!
accent-words-generic-aggressive-2 = Rrrr!

View File

@@ -77,6 +77,24 @@
- accent-words-zombie-9
- accent-words-zombie-10
- type: accent
id: zombieMoth
fullReplacements:
- accent-words-zombie-moth-1
- accent-words-zombie-moth-2
- accent-words-zombie-moth-3
- accent-words-zombie-moth-4
- accent-words-zombie-moth-5
- accent-words-zombie-moth-6
- accent-words-zombie-1
- accent-words-zombie-2
- accent-words-zombie-4
- accent-words-zombie-5
- accent-words-zombie-6
- accent-words-zombie-8
- accent-words-zombie-9
- accent-words-zombie-10
- type: accent
id: genericAggressive
fullReplacements:

View File

@@ -417,6 +417,8 @@
grindableSolutionName: food
- type: ReplacementAccent
accent: mothroach
- type: ZombieAccentOverride
accent: zombieMoth
- type: Vocal
sounds:
Male: UnisexMoth

View File

@@ -22,6 +22,8 @@
- type: Damageable
damageContainer: Biological
damageModifierSet: Moth
- type: ZombieAccentOverride
accent: zombieMoth
- type: Speech
speechVerb: Moth
- type: TypingIndicator