tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into offmed-staging

Browse Source
This commit is contained in:
Janet Blackquill
2025-11-05 16:52:49 -05:00
parent 97ff61daa3 7b1583085a
commit 340f6b02b3
1731 changed files with 38109 additions and 46754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Zombies/ZombieSystem.Transform.cs
View File

@@ -13,12 +13,10 @@ using Content.Server.NPC.HTN;
using Content.Server.NPC.Systems;
using Content.Server.StationEvents.Components;
using Content.Server.Speech.Components;
using Content.Server.Temperature.Components;
using Content.Shared.Body.Components;
using Content.Shared.Chat;
using Content.Shared.CombatMode;
using Content.Shared.CombatMode.Pacification;
using Content.Shared.Damage;
using Content.Shared.Damage.Components;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Humanoid;
@@ -44,6 +42,7 @@ using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Content.Shared.NPC.Prototypes;
using Content.Shared.Roles;
using Content.Shared.Temperature.Components;
using Content.Shared._Offbrand.Wounds; // Offbrand
namespace Content.Server.Zombies;
@@ -191,7 +190,6 @@ public sealed partial class ZombieSystem
var combat = EnsureComp<CombatModeComponent>(target);
RemComp<PacifiedComponent>(target);
_combat.SetCanDisarm(target, false, combat);
_combat.SetInCombatMode(target, true, combat);
//This is the actual damage of the zombie. We assign the visual appearance
//and range here because of stuff we'll find out later
@@ -291,8 +289,7 @@ public sealed partial class ZombieSystem
tempComp.ColdDamage.ClampMax(0);
//Heals the zombie from all the damage it took while human
if (TryComp<DamageableComponent>(target, out var damageablecomp))
_damageable.SetAllDamage(target, damageablecomp, 0);
_damageable.ClearAllDamage(target);
_mobState.ChangeMobState(target, MobState.Alive);
_faction.ClearFactions(target, dirty: false);