Skip to content

Commit

Permalink
yummer
Browse files Browse the repository at this point in the history
  • Loading branch information
MightBeNotReal committed Feb 14, 2025
1 parent 097f9d9 commit a09467e
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Content.Server/Body/Systems/BloodstreamSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public override void Update(float frameTime)

if (TryComp<BodyPartComponent>(wound.HoldingWoundable, out var bodyPart) && bodyPart.Body.HasValue)
{
TryModifyBleedAmount(bodyPart.Body.Value, (float) (newBleeds * bleeds.BleedingAmountRaw - bleeds.BleedingAmount));
TryModifyBleedAmount(bodyPart.Body.Value, (float) bleeds.BleedingAmount / 1.6f);

var nerveSys = _pain.GetNerveSystem(bodyPart.Body.Value);
if (nerveSys.HasValue)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Content.Shared.FixedPoint;
using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.GameStates;

Expand Down Expand Up @@ -70,6 +71,12 @@ public sealed partial class WoundableComponent : Component
/// </summary>
public Dictionary<EntityUid, WoundableHealingMultiplier> HealingMultipliers = new();

[DataField]
public SoundSpecifier WoundableDestroyedSound = new SoundCollectionSpecifier("WoundableDestroyed");

[DataField]
public SoundSpecifier WoundableDelimbedSound = new SoundCollectionSpecifier("WoundableDelimbed");

/// <summary>
/// State of the woundable. Severity basically.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ public void DestroyWoundable(EntityUid parentWoundableEntity, EntityUid woundabl

Dirty(woundableEntity, woundableComp);

_audio.PlayPvs(woundableComp.WoundableDestroyedSound, bodyPart.Body.Value);
_appearance.SetData(woundableEntity, WoundableVisualizerKeys.Update, 0);

if (IsWoundableRoot(woundableEntity, woundableComp))
Expand Down Expand Up @@ -608,6 +609,7 @@ public void AmputateWoundable(EntityUid parentWoundableEntity, EntityUid woundab
Dirty(woundableEntity, woundableComp);

_appearance.SetData(woundableEntity, WoundableVisualizerKeys.Update, 0);
_audio.PlayPvs(woundableComp.WoundableDelimbedSound, bodyPart.Body.Value);

DestroyWoundableChildren(woundableEntity, woundableComp);
_body.DetachPart(parentWoundableEntity, bodyPartId.Remove(0, 15), woundableEntity);
Expand Down
3 changes: 3 additions & 0 deletions Content.Shared/Backmen/Surgery/Wounds/Systems/WoundSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Content.Shared.Body.Systems;
using Content.Shared.Inventory;
using Content.Shared.Throwing;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
using Robust.Shared.Containers;
using Robust.Shared.Network;
Expand Down Expand Up @@ -33,6 +34,8 @@ public partial class WoundSystem : EntitySystem
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;

[Dependency] private readonly SharedAudioSystem _audio = default!;

// I'm the one.... who throws........
[Dependency] private readonly ThrowingSystem _throwing = default!;
[Dependency] private readonly InventorySystem _inventory = default!;
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 15 additions & 0 deletions Resources/Prototypes/SoundCollections/ReBELL.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,18 @@
- /Audio/_Shitmed/ReBELL/Bone/BoneGone3.ogg
- /Audio/_Shitmed/ReBELL/Bone/BoneGone4.ogg
- /Audio/_Shitmed/ReBELL/Bone/BoneGone5.ogg

# Dismemberment
- type: soundCollection
id: WoundableDestroyed
files:
- /Audio/_Shitmed/ReBELL/Woundables/WoundableDestroyed1.ogg
- /Audio/_Shitmed/ReBELL/Woundables/WoundableDestroyed2.ogg

- type: soundCollection
id: WoundableDelimbed
files:
- /Audio/_Shitmed/ReBELL/Woundables/WoundableAmputated1.ogg
- /Audio/_Shitmed/ReBELL/Woundables/WoundableAmputated2.ogg
- /Audio/_Shitmed/ReBELL/Woundables/WoundableAmputated3.ogg
- /Audio/_Shitmed/ReBELL/Woundables/WoundableAmputated4.ogg

0 comments on commit a09467e

Please sign in to comment.