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

2024-07-19 16:41:41 +03:00
parent 7302c67293 433e42db4c
commit 3921e01f29
101 changed files with 1154 additions and 182 deletions
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -69,7 +69,8 @@ namespace Content.Shared.Alert
        SuitPower,
        BorgHealth,
        BorgCrit,
-        BorgDead
+        BorgDead,
+        Offer // WD EDITS
    }

 }