cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-10-04 05:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix files for upmerge changes. Notably Nubnody and Damagaeable

Browse Source
This commit is contained in:
Coryler
2026-06-29 12:44:06 +02:00
parent 7d0cbda4e8
commit 7b939bfd28
65 changed files with 267 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Server/_Goobstation/Devil/DevilSystem.cs
+3 -11
View File
@@ -19,7 +19,6 @@ using Content.Server.Actions;
using Content.Shared.Administration.Systems;
using Content.Server.Antag.Components;
using Content.Server.Atmos.Components;
using Content.Server.Body.Systems;
using Content.Server.Destructible;
using Content.Server.Hands.Systems;
using Content.Server.Jittering;
@@ -51,8 +50,9 @@ using Robust.Shared.Audio.Systems;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Timing;
using Content.Shared.Body.Part;
using Content.Server.Bible.Components;
using Content.Server.Body.Components; // Delta V - Nubody Merge
using Content.Shared.Body; // Delta V - Nubody Merge
namespace Content.Server._Goobstation.Devil;
@@ -108,6 +108,7 @@ public sealed partial class DevilSystem : EntitySystem
RemComp<TemperatureSpeedComponent>(devil);
RemComp<CondemnedComponent>(devil);
RemComp<DestructibleComponent>(devil);
RemComp<RespiratorComponent>(devil); // Delta V - Remove Respirator since no more BreathingImmunity
// Adjust stats
EnsureComp<ZombieImmuneComponent>(devil);
@@ -127,15 +128,6 @@ public sealed partial class DevilSystem : EntitySystem
// Change damage modifier
_damageable.SetDamageModifierSetId(devil.Owner, devil.Comp.DevilDamageModifierSet);
// No decapitating the devil
foreach (var part in _body.GetBodyChildren(devil))
{
if (!TryComp(part.Id, out BodyPartComponent? woundable)) // DeltaV - Use Bodypart instead of woundable.
continue;
Dirty(part.Id, woundable);
}
// Add base actions
foreach (var actionId in devil.Comp.BaseDevilActions)
_actions.AddAction(devil, actionId);