fix damageeeee

space-sunrise · Nov 4, 2024 · 9314da4 · 9314da4
1 parent affa9c3
commit 9314da4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/Content.Server/_Sunrise/Medical/Surgery/SurgerySystem.Steps.cs b/Content.Server/_Sunrise/Medical/Surgery/SurgerySystem.Steps.cs
@@ -41,6 +41,8 @@ public void InitializeSteps()
 
     private void OnStepBleedComplete(Entity<SurgeryStepBleedEffectComponent> ent, ref SurgeryStepEvent args)
     {
+        if(ent.Comp.Damage is not null && TryComp<DamageableComponent>(args.Body, out var comp))
+        _damageableSystem.SetDamage(args.Body, comp, ent.Comp.Damage);
         //todo add wound
     }
 

diff --git a/Content.Shared/_Sunrise/Medical/Surgery/Components/_Steps.cs b/Content.Shared/_Sunrise/Medical/Surgery/Components/_Steps.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Chat.Prototypes;
+using Content.Shared.Damage;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 // Based on the RMC14.
@@ -7,7 +8,11 @@ namespace Content.Shared._Sunrise.Medical.Surgery.Effects.Step;
 
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class SurgeryClampBleedEffectComponent : Component;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class SurgeryStepAttachLimbEffectComponent : Component;
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class SurgeryStepBleedEffectComponent : Component;
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class SurgeryStepBleedEffectComponent : Component
+{
+    [DataField]
+    public DamageSpecifier? Damage;
+};
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class SurgeryStepAmputationEffectComponent : Component;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class SurgeryRemoveAccentComponent : Component;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class SurgeryClearProgressComponent : Component;

diff --git a/Resources/Prototypes/_Sunrise/Surgery/organs_steps.yml b/Resources/Prototypes/_Sunrise/Surgery/organs_steps.yml
@@ -380,7 +380,9 @@
     tools:
     - type: Scalpel
   - type: SurgeryStepBleedEffect
-    damage: 5
+    damage:
+      types:
+        Slash: 10
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: scalpel
@@ -424,7 +426,9 @@
     tools:
     - type: BoneSaw
   - type: SurgeryStepBleedEffect
-    damage: 10
+    damage:
+      types:
+        Slash: 10
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/saw.rsi
     state: saw
@@ -468,7 +472,9 @@
     tools:
     - type: Scalpel
   - type: SurgeryStepBleedEffect
-    damage: 8
+    damage:
+      types:
+        Slash: 10
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: scalpel
@@ -498,7 +504,9 @@
     tools:
     - type: Scalpel
   - type: SurgeryStepBleedEffect
-    damage: 12
+    damage:
+      types:
+        Slash: 10
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     state: scalpel