Merge branch 'master' into 0.53.0/sync

Unvanquished · May 1, 2022 · b041544 · b041544
2 parents 6eb78a2 + e87791f
commit b041544
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/daemon b/daemon
diff --git a/pkg/unvanquished_src.dpkdir b/pkg/unvanquished_src.dpkdir
diff --git a/src/sgame/sg_admin.cpp b/src/sgame/sg_admin.cpp
@@ -1078,7 +1078,7 @@ static void admin_default_levels()
 	Q_strncpyz( l->name, "^3Senior Admin", sizeof( l->name ) );
 	Q_strncpyz( l->flags,
 	            "listplayers admintest adminhelp time putteam spec999 warn kick mute showbans ban "
-	            "namelog buildlog ADMINCHAT register unregister l0 l1",
+	            "namelog buildlog ADMINCHAT register unregister l0 l1 pause revert",
 	            sizeof( l->flags ) );
 
 	l = l->next = (g_admin_level_t*) BG_Alloc( sizeof( g_admin_level_t ) );

diff --git a/src/shared/bg_gameplay.h b/src/shared/bg_gameplay.h
@@ -204,7 +204,7 @@ extern float FLAMER_IGNITE_CHANCE;
 extern float FLAMER_IGNITE_SPLCHANCE;
 #define FLAMER_DAMAGE_MAXDST_MOD 0.5f    // damage decreases linearly from full damage to this during missile lifetime
 #define FLAMER_SPLASH_MINDST_MOD 0.5f    // splash damage increases linearly from this to full damage during lifetime
-#define FLAMER_LEAVE_FIRE_CHANCE 0.3f
+#define FLAMER_LEAVE_FIRE_CHANCE 0.1f
 
 extern int   PRIFLE_SPEED;
 #define PRIFLE_DAMAGE_FULL_TIME  0 // in ms, full damage for this time