]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Conditional Meat spike logging severity (#40604)
authorKowlin <10947836+Kowlin@users.noreply.github.com>
Fri, 3 Oct 2025 11:20:18 +0000 (13:20 +0200)
committerGitHub <noreply@github.com>
Fri, 3 Oct 2025 11:20:18 +0000 (11:20 +0000)
* Reduce meatspike logging level from Extreme to High on non gibbing interactions

* Update butchering with some more conditionals

* Update Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
* Update Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs

index cdc831cd672b9789e1ff3351fe3521b23ceb6d54..bae411f356bb2d76fe0b489f4113a66c16d9367b 100644 (file)
@@ -7,6 +7,7 @@ using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Examine;
 using Content.Shared.Hands;
+using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -238,8 +239,11 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem
                 args.Target.Value,
                 ent);
 
+            // normally medium severity, but for humanoids high severity, so new players get relay'd to admin alerts.
+            var logSeverity = HasComp<HumanoidAppearanceComponent>(args.Target) ? LogImpact.High : LogImpact.Medium;
+
             _logger.Add(LogType.Action,
-                LogImpact.High,
+                logSeverity,
                 $"{ToPrettyString(args.User):user} put {ToPrettyString(args.Target):target} on the {ToPrettyString(ent):spike}");
 
             _audioSystem.PlayPredicted(ent.Comp.SpikeSound, ent, args.User);
@@ -316,8 +320,10 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem
         {
             _bodySystem.GibBody(args.Target.Value, true);
 
+            var logSeverity = HasComp<HumanoidAppearanceComponent>(args.Target) ? LogImpact.Extreme : LogImpact.High;
+
             _logger.Add(LogType.Gib,
-                LogImpact.Extreme,
+                logSeverity,
                 $"{ToPrettyString(args.User):user} finished butchering {ToPrettyString(args.Target):target} on the {ToPrettyString(ent):spike}");
         }
         else
@@ -325,8 +331,10 @@ public sealed class SharedKitchenSpikeSystem : EntitySystem
             EnsureComp<KitchenSpikeVictimComponent>(args.Target.Value);
 
             _damageableSystem.TryChangeDamage(args.Target, ent.Comp.ButcherDamage, true);
+
+            // Log severity for damaging other entities is normally medium.
             _logger.Add(LogType.Action,
-                LogImpact.Extreme,
+                LogImpact.Medium,
                 $"{ToPrettyString(args.User):user} butchered {ToPrettyString(args.Target):target} on the {ToPrettyString(ent):spike}");
         }