From 3f1fc2ef62b842038c85981baeef39ca1754dace Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Thu, 29 Nov 2012 02:20:09 +0000 Subject: [PATCH] Reduced EMP grenade range. - Traitor grenades: 10 heavy range and 20 light range is now 4 heavy range and 10 light range - Chem grenades: Chemists can no longer make EMP grenades as powerful as traitor grenades unless they use two large beakers. They used to be able to make EMP grenades as powerful as traitor grenades, or twice as powerful with two large beakers. Now they make slightly weaker versions unless two large beakers are used. - Updated the list of uplink items to show that EMP grenade boxes hold 7 grenades since someone forgot to change it. - EMP grenade boxes cost 4 crystals instead of 3. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5222 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/game_mode.dm | 2 +- code/game/objects/items/weapons/grenades/emgrenade.dm | 2 +- code/modules/reagents/Chemistry-Recipes.dm | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 47180fadeab..fd0c93bf364 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -34,7 +34,7 @@ /obj/item/weapon/gun/energy/crossbow:5:Energy Crossbow; /obj/item/weapon/melee/energy/sword:4:Energy Sword; /obj/item/weapon/storage/box/syndicate:10:Syndicate Bundle; -/obj/item/weapon/storage/emp_kit:3:5 EMP Grenades; +/obj/item/weapon/storage/emp_kit:4:7 EMP Grenades; Whitespace:Seperator; Stealthy and Inconspicuous Weapons; /obj/item/weapon/pen/paralysis:3:Paralysis Pen; diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 95ad0b77b1e..9edf68a60ac 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -6,7 +6,7 @@ prime() ..() - if(empulse(src, 10, 20)) + if(empulse(src, 4, 10)) del(src) return diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index a8d5bfac18a..bc7969b6e00 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -43,8 +43,9 @@ datum on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) - // 100 created volume = 10 heavy range & 20 light range = same as normal EMP grenade - empulse(location, round(created_volume / 10), round(created_volume / 5), 1) + // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes. + // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades. + empulse(location, round(created_volume / 24), round(created_volume / 14), 1) holder.clear_reagents() return /*