Some stuff

Author: OnsenCapy

Content.Goobstation.Shared/Terror/Components/BerserkerRageComponent.cs

@@ -9,8 +9,9 @@ namespace Content.Goobstation.Shared.Terror.Components;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class BerserkerRageComponent : Component
 {
+    [DataField]
     public float MinMultiplier = 1f;
 
-    public float MaxMultiplier = 3f;
-
+    [DataField]
+    public float MaxMultiplier = 2.5f;
 }

Content.Goobstation.Shared/Terror/Components/TerrorWrapComponent.cs

@@ -13,7 +13,7 @@ public sealed partial class TerrorWrapComponent : Component
     public TimeSpan DoAfter = TimeSpan.FromSeconds(5);
 
     /// <summary>
-    /// DoAfter timer for cocooning someone.
+    /// The prototype of the cocoon.
     /// </summary>
     [DataField]
     public EntProtoId CocoonProto = "TerrorCocoon";

Content.Goobstation.Shared/Terror/Systems/BerserkerRageSystem.cs

@@ -1,6 +1,10 @@
 using Content.Goobstation.Shared.Terror.Components;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Prototypes;
 using System.Linq;
 
 namespace Content.Goobstation.Shared.Terror.Systems;
@@ -10,6 +14,7 @@ namespace Content.Goobstation.Shared.Terror.Systems;
 /// </summary>
 public sealed class BerserkerRageSystem : EntitySystem
 {
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     public override void Initialize()
     {
         SubscribeLocalEvent<BerserkerRageComponent, GetUserMeleeDamageEvent>(OnGetUserDamage);
@@ -20,10 +25,26 @@ private float GetHealth(EntityUid ent)
         if (!TryComp<DamageableComponent>(ent, out var damageable))
             return 1f;
 
-        var damage = (float) damageable.TotalDamage;
-        const float maxDamage = 100f;
+        if (!TryComp<MobThresholdsComponent>(ent, out var thresholds))
+            return 1f;
+
+        // Find the damage value that corresponds to dead state which is basically max health
+        float maxDamage = 0f;
+
+        foreach (var (damage, state) in thresholds.Thresholds)
+        {
+            if (state == MobState.Dead)
+            {
+                maxDamage = (float) damage;
+                break;
+            }
+        }
+
+        if (maxDamage <= 0f)
+            return 1f;
 
-        return Math.Clamp(1f - (damage / maxDamage), 0f, 1f);
+        var totalDamage = (float) damageable.TotalDamage;
+        return Math.Clamp(1f - (totalDamage / maxDamage), 0f, 1f);
     }
 
     private void OnGetUserDamage(Entity<BerserkerRageComponent> ent, ref GetUserMeleeDamageEvent args)

Content.Goobstation.Shared/Terror/Systems/TerrorSpiderSystem.cs

@@ -15,11 +15,8 @@ namespace Content.Goobstation.Shared.Terror.Systems;
 /// </summary>
 public sealed class TerrorSpiderSystem : EntitySystem
 {
-    [Dependency] private readonly DamageableSystem _damage = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly INetManager _net = default!;
-
 
     public override void Initialize()
     {
@@ -47,7 +44,7 @@ private void BroadcastSpiderDeath(Entity<TerrorSpiderComponent> deadSpider)
 
         while (query.MoveNext(out var spiderPlayerUid, out var comp, out _))
         {
-            _popup.PopupPredicted($"A member of the hive has fallen… ({ToPrettyString(deadSpider.Owner)})", spiderPlayerUid, spiderPlayerUid, PopupType.Medium); // LocString broke this, deal with it Russians
+            _popup.PopupPredicted(Loc.GetString("terror-spider-hive-death", ("spider", deadSpider.Owner)), spiderPlayerUid, spiderPlayerUid, PopupType.Medium);
 
             _audio.PlayPredicted(comp.DeathSound, spiderPlayerUid, spiderPlayerUid);
         }

Content.Goobstation.Shared/Terror/Systems/TerrorWrapSystem.cs

@@ -1,4 +1,3 @@
-using Content.Goobstation.Common.Changeling;
 using Content.Goobstation.Shared.Terror.Components;
 using Content.Goobstation.Shared.Terror.Events;
 using Content.Shared.Administration.Logs;
@@ -20,8 +19,6 @@ public sealed class TerrorWrapSystem : EntitySystem
     [Dependency] private readonly ISharedAdminLogManager _admin = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly SharedEntityStorageSystem _storage = default!;
-
-
     public override void Initialize()
     {
         base.Initialize();

Resources/Locale/en-US/_Goobstation/Terror/terror.ftl

@@ -1,7 +1,5 @@
 terror-far-from-queen = You feel your life slipping away… the queen is too far away!
 
-hive-member-fallen = A member of the hive has fallen… ({name})
-
 sticky-web-generic = The sticky web ensnares you!
 sticky-web-infested = The sticky web ensnares you! Spiderlings begin to crawl all over you!
 sticky-web-poison = The sticky web ensnares you! You don't feel too good...
@@ -20,3 +18,5 @@ queen-sense-entry = {name} — {location}
 
 queen-death-gib = A blood-chilling psychic scream echoes through the hive as the Terror Queen is slain! Your body is torn apart by the psychic feedback!
 queen-death-rage = A blood-chilling psychic scream echoes through the hive as the Terror Queen is slain! You are filled with rage, your attacks dealing more damage the lower your health. Avenge her!
+
+terror-spider-hive-death = A member of the hive has fallen… { $spider }

Resources/Prototypes/_Goobstation/Terror/Actions/actions.yml

@@ -150,7 +150,7 @@
       components:
       - Cocoon
     canTargetSelf: false
-    event: !type:TentacleHookEvent
+    event: !type:TerrorLayEvent
 
 - type: entity
   id: ActionTerrorWrap

Resources/Prototypes/_Goobstation/Terror/Gamerules/events_roundstart.yml

@@ -25,4 +25,4 @@
       briefing:
         text: terror-queen-briefing
         sound: /Audio/_Goobstation/Terror/terrorspider.ogg
-        color: "#8b0000"
+        color: Purple

Resources/Prototypes/_Goobstation/Terror/Gamerules/terrorspider.yml

@@ -13,7 +13,7 @@
       - MindRoleGhostRoleTeamAntagonist
       briefing:
         text: terror-queen-briefing
-        color: "#8b0000"
+        color: Purple
         sound: /Audio/_Goobstation/Terror/terrorspider.ogg
   - type: AntagRandomSpawn
   - type: AntagSpawner
@@ -53,5 +53,5 @@
       - MindRoleGhostRoleTeamAntagonist
       briefing:
         text: terror-queen-briefing
-        color: "#8b0000"
+        color: Purple
         sound: /Audio/_Goobstation/Terror/terrorspider.ogg

Resources/Prototypes/_White/GameRules/events.yml

@@ -33,5 +33,7 @@
       max: 4
       pickPlayer: false
       briefing:
-        text: terror-queen-briefing
-        color: "#8b0000"
+        text: xenomorph-role-greeting
+        color: "#8c3986"
+      mindRoles:
+      - MindRoleXenomorph