Merge remote-tracking branch 'upstream/master'

2024-08-02 23:26:33 +03:00
parent 18cca8a41b dad51d36a0
commit 64ad5900c8
104 changed files with 52486 additions and 49138 deletions
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -39,8 +39,10 @@ namespace Content.Shared.Alert
        VeryVeryGood,
        MoodDead,
        Arousal, //AMOUR
-        //WD end
        CultBuffed,
+        Knockdown,
+        RecentlyBlocked,
+        //WD end
        PilotingShuttle,
        Peckish,
        Starving,