From e72cd0fdbd449a712dd3f7db0462b09dfb74c397 Mon Sep 17 00:00:00 2001 From: "musketstgstation@gmail.com" Date: Sun, 17 Jul 2011 13:52:40 +0000 Subject: [PATCH] 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 | 2 +- code/game/objects/empulse.dm | 7 ++++--- code/game/objects/items/weapons/grenades.dm | 2 +- tgstation.dme | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 469b08c7e8a..1dcecd10335 100644 --- a/code/defines/obj/storage.dm +++ b/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" diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 127981c2dcb..0a0144b2f24 100644 --- a/code/game/objects/empulse.dm +++ b/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' diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm index 84bde4525a6..58c9b3acd9d 100644 --- a/code/game/objects/items/weapons/grenades.dm +++ b/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) diff --git a/tgstation.dme b/tgstation.dme index 0bde3e3689d..fa86c9db7e9 100644 --- a/tgstation.dme +++ b/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"