Merge remote-tracking branch 'upstream/master'

2024-06-17 00:04:36 +03:00
parent ae4e537a6f f0492b422c
commit c88050b109
20 changed files with 299 additions and 115 deletions
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -1749,7 +1749,7 @@ namespace Content.Shared.CCVar
        /// Cooldown for missions.
        /// </summary>
        public static readonly CVarDef<float>
-            SalvageExpeditionCooldown = CVarDef.Create("salvage.expedition_cooldown", 780f, CVar.REPLICATED);
+            SalvageExpeditionCooldown = CVarDef.Create("salvage.expedition_cooldown", 300f, CVar.REPLICATED);

        /*
         * Flavor