Fixed EMP area logging.

Fixed some incorrect messages associated with EMP grenades.
Unchecked an unused file.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1873 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/storage.dm

@@ -206,7 +206,7 @@
 
 /obj/item/weapon/storage/emp_kit
 	desc = "A box with 5 emp grenades."
-	name = "Emp grenades"
+	name = "emp grenades"
 	icon_state = "flashbang"
 	item_state = "syringe_kit"
 

code/game/objects/empulse.dm

@@ -1,12 +1,13 @@
 proc/empulse(turf/epicenter, heavy_range, light_range, nolog=0)
 	if(!epicenter) return
-	if (!nolog)
-		message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
-		log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
 
 	if (!istype(epicenter, /turf))
 		epicenter = get_turf(epicenter.loc)
 
+	if (!nolog)
+		message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
+		log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
+
 	if(heavy_range > 1)
 		var/obj/overlay/pulse = new/obj/overlay ( epicenter )
 		pulse.icon = 'effects.dmi'

code/game/objects/items/weapons/grenades.dm

@@ -220,7 +220,7 @@ FLASHBANG
 				prime()
 				return
 		else
-			user << "\red You prime the flashbang! [det_time/10] seconds!"
+			user << "\red You prime the EMP grenade! [det_time/10] seconds!"
 			src.state = 1
 			src.icon_state = "empar"
 			add_fingerprint(user)

tgstation.dme

@@ -641,7 +641,6 @@
 #include "code\modules\admin\verbs\deadsay.dm"
 #include "code\modules\admin\verbs\debug.dm"
 #include "code\modules\admin\verbs\diagnostics.dm"
-#include "code\modules\admin\verbs\grillify.dm"
 #include "code\modules\admin\verbs\mapping.dm"
 #include "code\modules\admin\verbs\massmodvar.dm"
 #include "code\modules\admin\verbs\MC.dm"