diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index b52dbbd776..6c186ada75 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -590,6 +590,16 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem // is when a melee weapon is examined. Misses are inferred from an // empty HitEntities. // TODO: This needs fixing + if (meleeUid == user) + { + AdminLogger.Add(LogType.MeleeHit, LogImpact.Low, + $"{ToPrettyString(user):actor} melee attacked (light) using their hands and missed"); + } + else + { + AdminLogger.Add(LogType.MeleeHit, LogImpact.Low, + $"{ToPrettyString(user):actor} melee attacked (light) using {ToPrettyString(meleeUid):tool} and missed"); + } var missEvent = new MeleeHitEvent(new List(), user, meleeUid, damage); RaiseLocalEvent(meleeUid, missEvent); Audio.PlayPredicted(component.SwingSound, meleeUid, user); @@ -634,13 +644,13 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem if (meleeUid == user) { - AdminLogger.Add(LogType.MeleeHit, - $"{ToPrettyString(user):user} melee attacked {ToPrettyString(ev.Target.Value):target} using their hands and dealt {damageResult.Total:damage} damage"); + AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium, + $"{ToPrettyString(user):actor} melee attacked (light) {ToPrettyString(ev.Target.Value):subject} using their hands and dealt {damageResult.Total:damage} damage"); } else { - AdminLogger.Add(LogType.MeleeHit, - $"{ToPrettyString(user):user} melee attacked {ToPrettyString(ev.Target.Value):target} using {ToPrettyString(meleeUid):used} and dealt {damageResult.Total:damage} damage"); + AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium, + $"{ToPrettyString(user):actor} melee attacked (light) {ToPrettyString(ev.Target.Value):subject} using {ToPrettyString(meleeUid):tool} and dealt {damageResult.Total:damage} damage"); } PlayHitSound(ev.Target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component.HitSound); @@ -689,6 +699,16 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem if (entities.Count == 0) { + if (meleeUid == user) + { + AdminLogger.Add(LogType.MeleeHit, LogImpact.Low, + $"{ToPrettyString(user):actor} melee attacked (heavy) using their hands and missed"); + } + else + { + AdminLogger.Add(LogType.MeleeHit, LogImpact.Low, + $"{ToPrettyString(user):actor} melee attacked (heavy) using {ToPrettyString(meleeUid):tool} and missed"); + } var missEvent = new MeleeHitEvent(new List(), user, meleeUid, damage); RaiseLocalEvent(meleeUid, missEvent); @@ -764,13 +784,13 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem if (meleeUid == user) { - AdminLogger.Add(LogType.MeleeHit, - $"{ToPrettyString(user):user} melee attacked {ToPrettyString(entity):target} using their hands and dealt {damageResult.Total:damage} damage"); + AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium, + $"{ToPrettyString(user):actor} melee attacked (heavy) {ToPrettyString(entity):subject} using their hands and dealt {damageResult.Total:damage} damage"); } else { - AdminLogger.Add(LogType.MeleeHit, - $"{ToPrettyString(user):user} melee attacked {ToPrettyString(entity):target} using {ToPrettyString(meleeUid):used} and dealt {damageResult.Total:damage} damage"); + AdminLogger.Add(LogType.MeleeHit, LogImpact.Medium, + $"{ToPrettyString(user):actor} melee attacked (heavy) {ToPrettyString(entity):subject} using {ToPrettyString(meleeUid):tool} and dealt {damageResult.Total:damage} damage"); } } }