diff --git a/src/gs-entbase/server/trigger_changelevel.cpp b/src/gs-entbase/server/trigger_changelevel.cpp
index 2b9e9d76..e66db8f2 100644
--- a/src/gs-entbase/server/trigger_changelevel.cpp
+++ b/src/gs-entbase/server/trigger_changelevel.cpp
@@ -105,17 +105,15 @@ trigger_changelevel::Trigger(void)
 	/* eActivator == player who triggered the damn thing */
 	m_activator = eActivator;
 
-	if (!(m_activator.flags & FL_CLIENT))
+	if (!(eActivator.flags & FL_CLIENT))
 		return;
 
 	if (m_flChangeDelay) {
-		dprint(sprintf("^2trigger_changelevel::^3Trigger^7: Delayed change to `%s` in %d sec/s\n", 
-			m_strMap, m_flChangeDelay));
+		dprint(sprintf("^2trigger_changelevel::^3Trigger^7: Delayed change to `%s` in %d sec/s\n", m_strMap, m_flChangeDelay));
 		think = Change;
 		nextthink = time + m_flChangeDelay;
 	} else {
-		dprint(sprintf("^2trigger_changelevel::^3Trigger^7: Change to `%s` requested\n", 
-			m_strMap));
+		dprint(sprintf("^2trigger_changelevel::^3Trigger^7: Change to `%s` requested\n", m_strMap));
 		Change();
 	}
 }
diff --git a/src/server/valve/gamerules_multiplayer.cpp b/src/server/valve/gamerules_multiplayer.cpp
index 8bcb9650..2759f0c6 100644
--- a/src/server/valve/gamerules_multiplayer.cpp
+++ b/src/server/valve/gamerules_multiplayer.cpp
@@ -69,6 +69,44 @@ HLMultiplayerRules::PlayerDeath(base_player pl)
 	pl.nextthink = time + 4.0f;
 	Sound_Play(pl, CHAN_AUTO, "player.die");
 
+	/* silly announcer */
+	if (g_dmg_eAttacker != world && g_dmg_eAttacker != g_dmg_eTarget) {
+		int r = rint(random(0,10));
+
+		switch (r) {
+		case 0:
+			Vox_Broadcast("buzwarn go go go");
+			break;
+		case 1:
+			Vox_Broadcast("buzwarn goodbye");
+			break;
+		case 2:
+			Vox_Broadcast("buzwarn kill one out");
+			break;
+		case 3:
+			Vox_Broadcast("buzwarn woop woop");
+			break;
+		case 4:
+			Vox_Broadcast("buzwarn terminated");
+			break;
+		case 5:
+			Vox_Broadcast("buzwarn slow soldier");
+			break;
+		case 6:
+			Vox_Broadcast("buzwarn that is hot");
+			break;
+		case 7:
+			Vox_Broadcast("buzwarn great kill");
+			break;
+		case 8:
+			Vox_Broadcast("buzwarn good kill");
+			break;
+		default:
+			Vox_Broadcast("buzwarn exterminate exterminate");
+			break;
+		}
+	}
+
 	if (pl.health < -50) {
 		pl.health = 0;
 		FX_GibHuman(pl.origin);