Merge remote-tracking branch 'upstream/master' into ups

2024-08-11 18:33:08 +03:00
parent 412b9f82cb f9725fa137
commit dbb90cab56
202 changed files with 2224 additions and 756 deletions
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -40,6 +40,7 @@ namespace Content.Shared.Alert
        MoodDead,
        Arousal, //AMOUR
        CultBuffed,
+        BloodSpells,
        Knockdown,
        RecentlyBlocked,
        //WD end