-Increased the range of the EMP grenade to 10/20.

-Added two more grenades inside the EMP kit.

-Made reagents, which react to turf, require a certain number of volume before affecting the turf. For instance, you need 5 units of Thermite on a wall now.

-Added an EMP pulse recipe. It will react immediately on the mixing of the required reagents, which are Uranium and Iron. A grenade with 50 units of Uranium and Iron will act the same as an ordinary EMP grenade, with 10/20 range. Less or more reagents will change the range.

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

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

@@ -1,11 +1,12 @@
 /obj/item/weapon/grenade/empgrenade
-	name = "emp grenade"
+	name = "classic emp grenade"
 	icon_state = "emp"
 	item_state = "emp"
 	origin_tech = "materials=2;magnets=3"
 
 	prime()
 		..()
-		if(empulse(src, 5, 7))
+		if(empulse(src, 10, 20))
 			del(src)
 		return
+

code/game/objects/items/weapons/storage/kit.dm

@@ -41,6 +41,8 @@
 	new /obj/item/weapon/grenade/empgrenade(src)
 	new /obj/item/weapon/grenade/empgrenade(src)
 	new /obj/item/weapon/grenade/empgrenade(src)
+	new /obj/item/weapon/grenade/empgrenade(src)
+	new /obj/item/weapon/grenade/empgrenade(src)
 	..()
 	return
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -124,6 +124,7 @@ datum
 				if(!istype(T)) return
 				var/datum/reagent/blood/self = src
 				src = null
+				if(!(volume >= 3)) return
 				//var/datum/disease/D = self.data["virus"]
 				if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
 					var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
@@ -262,6 +263,7 @@ datum
 			reaction_turf(var/turf/simulated/T, var/volume)
 				if (!istype(T)) return
 				src = null
+				if(volume >= 1)
 					if(T.wet >= 2) return
 					T.wet = 2
 					spawn(800)
@@ -773,6 +775,7 @@ datum
 
 			reaction_turf(var/turf/T, var/volume)
 				src = null
+				if(volume >= 3)
 					if(!istype(T, /turf/space))
 						new /obj/effect/decal/cleanable/greenglow(T)
 						return
@@ -802,12 +805,19 @@ datum
 
 			reaction_turf(var/turf/T, var/volume)
 				src = null
+				if(volume >= 5)
 					if(istype(T, /turf/simulated/wall))
 						T:thermite = 1
 						T.overlays = null
 						T.overlays = image('icons/effects/effects.dmi',icon_state = "thermite")
 				return
 
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				M.adjustFireLoss(1)
+				..()
+				return
+
 		mutagen
 			name = "Unstable mutagen"
 			id = "mutagen"
@@ -921,6 +931,7 @@ datum
 
 			reaction_turf(var/turf/T, var/volume)
 				src = null
+				if(volume >= 3)
 					if(!istype(T, /turf/space))
 						new /obj/effect/decal/cleanable/greenglow(T)
 
@@ -986,6 +997,7 @@ datum
 					if(O)
 						O.clean_blood()
 			reaction_turf(var/turf/T, var/volume)
+				if(volume >= 1)
 					T.overlays = null
 					T.clean_blood()
 					for(var/obj/effect/decal/cleanable/C in src)
@@ -2626,6 +2638,7 @@ datum
 				return
 
 			reaction_turf(var/turf/simulated/T, var/volume)
+				if(volume >= 3)
 					if(!istype(T)) return
 					T.Bless()
 

code/modules/reagents/Chemistry-Recipes.dm

@@ -31,7 +31,20 @@ datum
 				var/datum/effect/effect/system/reagents_explosion/e = new()
 				e.set_up(round (created_volume/10, 1), location, 0, 0)
 				e.start()
+				holder.clear_reagents()
+				return
 
+		emp_pulse
+			name = "EMP Pulse"
+			id = "emp_pulse"
+			result = null
+			required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
+			result_amount = 2
+
+			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)
 				holder.clear_reagents()
 				return
 /*

html/changelog.html

@@ -48,6 +48,17 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">30 August 2012</h2>
+	<h3 class="author">Giacom updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">You can now create an EMP Pulse. Like an explosion, it is the mixing of two reagents that trigger this to happen. I will tell you the first required reagent. Uranium. Have fun!</li>
+		<li class="tweak">I have made most chemicals need 3-5 or more chemicals in order to react to a turf. For instance, you need at least 5 units of thermite splashed on a wall for it to burn down."<li>
+		<li class="tweak">The EMP kit, that you can buy through the uplink, has two more grenades in them now. Making the box full of EMP grenades!</li>
+		<li class="tweak">Changed the EMP grenade's range to be much bigger.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">29 August 2012</h2>
 	<h3 class="author">Nodrak updated:</h3>