juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls

Browse Source 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
This commit is contained in:
Ed
2024-07-19 11:23:38 +03:00
parent c8a90a74c0 d6e0114126
commit ca843bd84a
65 changed files with 318 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
View File

@@ -60,12 +60,6 @@ namespace Content.Server.Damage.Systems
_sharedCameraRecoil.KickCamera(args.Target, direction);
}
}
// TODO: If more stuff touches this then handle it after.
if (TryComp<PhysicsComponent>(uid, out var physics))
{
_thrownItem.LandComponent(args.Thrown, args.Component, physics, false);
}
}
private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component, ref DamageExamineEvent args)