Merge pull request #4329 from mnva0/nosurgerypainwhennumb

People with the Numb trait no longer scream during surgery
This commit is contained in:
William Lemon 2025-10-03 10:33:48 +10:00 committed by GitHub
commit ebb52d85e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 0 deletions

View File

@ -16,6 +16,7 @@ using Content.Shared._DV.Surgery;
using Content.Shared.FixedPoint;
using Content.Shared.Forensics.Components;
using Content.Shared.Damage.Prototypes;
using Content.Shared.Traits.Assorted;
// End DeltaV Additions
using Content.Shared._Shitmed.Medical.Surgery;
using Content.Shared._Shitmed.Medical.Surgery.Conditions;
@ -263,6 +264,8 @@ public sealed class SurgerySystem : SharedSurgerySystem
{
if (HasComp<AnesthesiaComponent>(args.Body)) // DeltaV
return;
if (HasComp<PainNumbnessComponent>(args.Body)) // DeltaV
return;
_chat.TryEmoteWithChat(args.Body, ent.Comp.Emote);
}