From: Samual Lenks <samual@xonotic.org>
Date: Sat, 15 Dec 2012 05:20:23 +0000 (-0500)
Subject: Committing progress to move over to desktop...
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~337
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9efd12c8ec8c3c985fc8d1d98198dae73cd089e8;p=xonotic%2Fxonotic-data.pk3dir.git

Committing progress to move over to desktop...
---

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 2e8491bf8..db127c42f 100644
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -188,7 +188,7 @@ string got_commandkey;
 	MSG_INFO_NOTIF(INFO_DEATH_MURDER_CHEAT,				2, 1, XPND3(s1, s2, SPREE_END), XPND2(s1, s2),		"notify_death",			_("^BG%s^K1 was unfairly eliminated by ^BG%s^K1%s\n"), "") \
 	MSG_INFO_NOTIF(INFO_DEATH_MURDER_FIRE,				2, 1, XPND3(s1, s2, SPREE_END), XPND2(s1, s2), 		"notify_death",			_("^BG%s^K1 was burnt up into a crisp by ^BG%s^K1%s\n"), _("^F1%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s\n")) \
 	MULTITEAM_INFO(INFO_SCORES_, 4,						0, 0, NO_STR_ARG, XPND2("", ""),					"",						_("^TC^TT ^BGteam scores!\n"), "") \
-	MSG_INFO_NOTIF(INFO_WEAPON_THINKING_WITH_PORTALS,			1, 0, s1, XPND2(s1, ""), 							"notify_death",			_("^BG%s^K1 is now thinking with portals...\n"), "") \
+	MSG_INFO_NOTIF(INFO_WEAPON_THINKING_WITH_PORTALS,			1, 0, s1, XPND2(s1, ""), 				"notify_selfkill",			_("^BG%s^K1 is now thinking with portals...\n"), "") \
 	MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_SUICIDE, 				1, 0, s1, XPND2(s1, ""), 				"weaponcrylink", _("^BG%s^K1 felt the strong pull of their Crylink\n"), "") \
 	MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_MURDER, 					2, 0, XPND2(s1, s2), XPND2(s1, s2), 	"weaponcrylink", _("^BG%s^K1 felt the strong pull of ^BG%s^K1's Crylink\n"), "") \
 	MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_ORBS, 			1, 0, s1, XPND2(s1, ""), 				"weaponelectro", _("^BG%s^K1 could not remember where they put their Electro plasma\n"), "") \
@@ -313,6 +313,55 @@ string got_commandkey;
 
 #define MSG_WEAPON_NOTIFICATIONS \
 	MSG_WEAPON_NOTIF(WEAPON_EMPTY,						NO_MSG,									NO_MSG)
+	MSG_INFO_NOTIF(INFO_WEAPON_THINKING_WITH_PORTALS,			
+	MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_SUICIDE, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_MURDER, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_ORBS, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_BOLT, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_BOLT, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_ORBS, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_COMBO, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_SUICIDE_FIREMINE, 		
+	MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_SUICIDE_BLAST, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_FIREMINE, 		
+	MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_BLAST, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_SUICIDE_EXPLODE, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_SUICIDE_BOUNCE, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_EXPLODE,	 		
+	MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_BOUNCE, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_SUICIDE, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_BURST, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_SPRAY, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_HLAC_SUICIDE, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_HLAC_MURDER, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_HOOK_MURDER,						
+	MSG_INFO_NOTIF(INFO_WEAPON_LASER_SUICIDE, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_LASER_MURDER, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_SUICIDE, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_MURDER, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_MINSTANEX_MURDER, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_NEX_MURDER, 						
+	MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING,		
+	MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_PIERCING, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HEADSHOT, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_SUICIDE, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT, 	
+	MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH, 	
+	MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_SUICIDE, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_TAG, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_SPRAY, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER_SLAP, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_TUBA_SUICIDE, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_TUBA_MURDER, 					
+	MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_SUICIDE, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_MURDER, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_SUICIDE, 			
+	MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_MURDER, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SNIPE, 				
+	MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SPRAY, 				
 
 
 #define MSG_DEATH_NOTIFICATIONS \