Merge branch 'balance' into staging

FortressOne · Oct 31, 2024 · c6e188f · c6e188f
2 parents a0c71b2 + 41c2ddd
commit c6e188f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ssqc/client.qc b/ssqc/client.qc
@@ -288,8 +288,6 @@ static float NB_UseMinPing() {
 void ActivateOrgGame() {
     disable_resup_gren = 2;  // No gren2 pickups
 
-    drop_gren1 = 0;  // No grenades in backpacks
-
     int i;
     for (i = 1; i <= 9; i++) // 3 gren spawn
         SetAllRoles(i, 1, 3);
@@ -565,7 +563,7 @@ void () DecodeLevelParms = {
         pipecooldown_time = CF_GetSetting("pcdt", "pipecooldown_time", "0.5");
 
         // cooldown applies to all pipes [on]
-        allpipes_cooldown = CF_GetSetting("apcd", "allpipes_cooldown", "on");
+        allpipes_cooldown = CF_GetSetting("apcd", "allpipes_cooldown", "off");
 
         // allow medic aura [on]
         medicaura = CF_GetSetting("ma", "medicaura", "on");

diff --git a/ssqc/tfort.qc b/ssqc/tfort.qc
@@ -611,6 +611,7 @@ void () TeamFortress_ShowTF = {
     CF_PrintSetting("Old grenades", old_grens, "", 1);
     CF_PrintSetting("Drop grenades on ground", drop_grenades, "", 1);
     CF_PrintSetting("Drop grenades in pack", drop_grenpack, "", 1);
+
     if (drop_grenpack) {
         CF_PrintSetting("- Grenades type 1", drop_gren1, "", 0);
         CF_PrintSetting("- Grenades type 2", drop_gren2, "", 0);