X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_laser.qc;h=69dcb17aa5c292d4328b539668c8dac674f76935;hb=99e4fa0264127dfcf4675d5f645061b51af815e4;hp=ecedc89fc1bb5748ccba92a8f7b7e750c49f3ae4;hpb=8a390ed02bde47c98a5e6bd47c7eb9b1cb3cd1dc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index ecedc89fc..69dcb17aa 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -291,6 +291,14 @@ float w_laser(float req)
 	{
 		W_Reload(0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+	{
+		return WEAPON_LASER_SUICIDE;
+	}
+	else if (req == WR_KILLMESSAGE)
+	{
+		return WEAPON_LASER_MURDER;
+	}
 	return TRUE;
 }
 #endif
@@ -309,15 +317,6 @@ float w_laser(float req)
 	{
 		precache_sound("weapons/laserimpact.wav");
 	}
-	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = _("%s lasered themself to hell");
-	else if (req == WR_KILLMESSAGE)
-	{
-		if(w_deathtype & HITTYPE_SECONDARY)
-			w_deathtypestring = _("%s was cut in half by %s's gauntlet"); // unchecked: SPLASH
-		else
-			w_deathtypestring = _("%s was lasered to death by %s"); // unchecked: SPLASH
-	}
 	return TRUE;
 }
 #endif