* Most of the changes in the forum thread "Shake up"

1 files changed, 9 insertions, 0 deletions

diff --git a/src/game/g_active.c b/src/game/g_active.c
index acd6a4f1..91f513d6 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1272,6 +1272,15 @@ void ClientThink_real( gentity_t *ent )
     client->retriggerArmouryMenu = 0;
   }
 
+  if( ent->suicideTime > 0 && ent->suicideTime < level.time )
+  {
+    ent->flags &= ~FL_GODMODE;
+    ent->client->ps.stats[ STAT_HEALTH ] = ent->health = 0;
+    player_die( ent, ent, ent, 100000, MOD_SUICIDE );
+
+    ent->suicideTime = 0;
+  }
+
   // perform once-a-second actions
   ClientTimerActions( ent, msec );
 }