Compare commits

...
Author SHA1 Message Date
Vanessa 7ad3187963 Add damage examinable to base structure. 2026-06-27 09:50:31 -05:00
Delta-V bot 932dd5e429 Automatic changelog update 2026-06-26 19:23:56 +02:00
wesker 3001253e43 Synthetic Emotes Fix (#6125)
* separate synthetic emote

* fix duplicate IDs (server error)

* Update speech_emotes.yml

* maybe this

* maybe keep the removed things from upstream lol

* imagine yamlops-ing when the problem was your trash code all along
2026-06-26 19:23:37 +02:00
5 changed files with 41 additions and 23 deletions
+18 -16
View File
@@ -1,6 +1,7 @@
using Content.Server.Body.Systems; using Content.Server.Body.Systems;
using Content.Server.Database; using Content.Server.Chat.Systems;
using Content.Shared.Body.Components; using Content.Shared.Body.Components;
using Content.Shared.Chat;
using Content.Shared.Chat.Prototypes; using Content.Shared.Chat.Prototypes;
using Content.Shared.Chat.TypingIndicator; using Content.Shared.Chat.TypingIndicator;
using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Reagent;
@@ -22,12 +23,15 @@ public sealed class SynthSystem : EntitySystem
[Dependency] private readonly BloodstreamSystem _bloodstream = default!; [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
[Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly TagSystem _tag = default!;
[Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly ChatSystem _chat = default!;
private EmoteSoundsPrototype? _syntheticEmoteSounds; // delta-v - proper synthe emote implementation
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<SynthComponent, ComponentStartup>(OnStartup); SubscribeLocalEvent<SynthComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<SynthComponent, EmoteEvent>(OnEmote); // delta-v - proper synthe emote implementation
} }
private void OnStartup(EntityUid uid, SynthComponent component, ComponentStartup args) private void OnStartup(EntityUid uid, SynthComponent component, ComponentStartup args)
@@ -46,20 +50,18 @@ public sealed class SynthSystem : EntitySystem
} }
// End DeltaV // End DeltaV
// Begin DeltaV - Add SyntheticEmotes tag and merge synthetic emote sounds into species sounds _tag.AddTag(uid, SyntheticEmotesTag); // delta-v - proper synthe emote implementation
_tag.AddTag(uid, SyntheticEmotesTag);
if (TryComp<VocalComponent>(uid, out var vocal)
&& _proto.TryIndex(SyntheticEmoteSounds, out var synthSounds)
&& vocal.EmoteSounds is { } currentSoundsId
&& _proto.TryIndex(currentSoundsId, out var currentSounds))
{
foreach (var (emoteId, sound) in synthSounds.Sounds)
{
currentSounds.Sounds.TryAdd(emoteId, sound);
}
Dirty(uid, vocal);
}
// End DeltaV
} }
// Start DeltaV - proper synthe emote implementation
private void OnEmote(EntityUid uid, SynthComponent component, ref EmoteEvent args)
{
if (args.Handled)
return;
_syntheticEmoteSounds ??= _proto.Index(SyntheticEmoteSounds);
args.Handled = _chat.TryPlayEmoteSound(uid, _syntheticEmoteSounds, args.Emote);
}
// End DeltaV
} }
+7 -7
View File
@@ -1,11 +1,4 @@
Entries: Entries:
- author: marigauge
changes:
- message: Cybernetic eyes are no longer edible.
type: Fix
id: 1964
time: '2025-12-16T15:08:42.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/4967
- author: ShepardToTheStars - author: ShepardToTheStars
changes: changes:
- message: Brains are no longer edible. - message: Brains are no longer edible.
@@ -4417,4 +4410,11 @@
id: 2464 id: 2464
time: '2026-06-25T17:59:50.0000000+00:00' time: '2026-06-25T17:59:50.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/6054 url: https://github.com/DeltaV-Station/Delta-v/pull/6054
- author: wesk
changes:
- message: Fixed synthetics from giving everyone borg emotes on round-start.
type: Fix
id: 2465
time: '2026-06-26T17:23:37.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/6125
Order: 1 Order: 1
@@ -0,0 +1,7 @@
# Base structure damage examine values
comp-structure-damaged-1 = It looks fully intact.
comp-structure-damaged-2 = It has a few scratches.
comp-structure-damaged-3 = It has a few large dents.
comp-structure-damaged-4 = [color=yellow]It has several big cracks running along its surface.[/color]
comp-structure-damaged-5 = [color=orange]It has deep cracks across multiple layers.[/color]
comp-structure-damaged-6 = [color=red]It's extremely damaged and on the verge of falling apart.[/color]
@@ -26,6 +26,10 @@
- type: Tag - type: Tag
tags: tags:
- Structure - Structure
# BEGIN DeltaV
- type: ExaminableDamage
messages: BaseStructureMessages
# END DeltaV
- type: entity - type: entity
# This means that it's not anchored on spawn. # This means that it's not anchored on spawn.
@@ -0,0 +1,5 @@
- type: localizedDataset
id: BaseStructureMessages
values:
prefix: comp-structure-damaged-
count: 6