FIX: MiGo Damage by BarbedWire in Astral

SerbiaStrong-220 · Feb 19, 2025 · 61cd466 · 61cd466
1 parent 520e2b0
commit 61cd466
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Content.Server/SS220/CultYogg/MiGo/MiGoSystem.cs b/Content.Server/SS220/CultYogg/MiGo/MiGoSystem.cs
@@ -56,6 +56,7 @@ public override void ChangeForm(EntityUid uid, MiGoComponent comp, bool isMateri
         {
             //no opening door during astral
             _tag.AddTag(uid, "DoorBumpOpener");
+            _tag.RemoveTag(uid, "MiGoInAstral");
             comp.MaterializationTime = null;
             comp.AlertTime = 0;
 
@@ -82,7 +83,7 @@ public override void ChangeForm(EntityUid uid, MiGoComponent comp, bool isMateri
         {
             comp.AudioPlayed = false;
             _tag.RemoveTag(uid, "DoorBumpOpener");
-
+            _tag.AddTag(uid, "MiGoInAstral");
             _alerts.ShowAlert(uid, comp.AstralAlert);
 
             //no phisyc during astral

diff --git a/Resources/Prototypes/SS220/Entities/Structures/Specific/barbed_wire.yml b/Resources/Prototypes/SS220/Entities/Structures/Specific/barbed_wire.yml
@@ -72,13 +72,19 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
     - type: DamageContacts
+      ignoreWhitelist:
+        tags:
+          - MiGoInAstral
       damage:
         types:
           Slash: 5
           Piercing: 5
     - type: SpeedModifierContacts
       walkSpeedModifier: 0.2
       sprintSpeedModifier: 0.2
+      ignoreWhitelist:
+        tags:
+          - MiGoInAstral
     - type: Appearance
     - type: GenericVisualizer
       visuals:

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
@@ -1485,4 +1485,9 @@
   id: HolofanProjectorSecurity
 # SS220 Fix #2009 end
 
+# ss220 migo damage in astral fix start
+- type: Tag
+  id: MiGoInAstral
+# ss220 migo damage in astral fix end
+
 # ALPHABETICAL