diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index 3454f9b9fa9..95ad0b77b1e 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/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
+
diff --git a/code/game/objects/items/weapons/storage/kit.dm b/code/game/objects/items/weapons/storage/kit.dm
index 6aa4b0bd250..6622ebea9e7 100644
--- a/code/game/objects/items/weapons/storage/kit.dm
+++ b/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
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index bb314e8ac23..ab36605a8d6 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/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,15 +263,16 @@ datum
reaction_turf(var/turf/simulated/T, var/volume)
if (!istype(T)) return
src = null
- if(T.wet >= 2) return
- T.wet = 2
- spawn(800)
- if (!istype(T)) return
- T.wet = 0
- if(T.wet_overlay)
- T.overlays -= T.wet_overlay
- T.wet_overlay = null
- return
+ if(volume >= 1)
+ if(T.wet >= 2) return
+ T.wet = 2
+ spawn(800)
+ if (!istype(T)) return
+ T.wet = 0
+ if(T.wet_overlay)
+ T.overlays -= T.wet_overlay
+ T.wet_overlay = null
+ return
anti_toxin
name = "Anti-Toxin (Dylovene)"
@@ -773,9 +775,10 @@ datum
reaction_turf(var/turf/T, var/volume)
src = null
- if(!istype(T, /turf/space))
- new /obj/effect/decal/cleanable/greenglow(T)
- return
+ if(volume >= 3)
+ if(!istype(T, /turf/space))
+ new /obj/effect/decal/cleanable/greenglow(T)
+ return
ryetalyn
@@ -802,10 +805,17 @@ datum
reaction_turf(var/turf/T, var/volume)
src = null
- if(istype(T, /turf/simulated/wall))
- T:thermite = 1
- T.overlays = null
- T.overlays = image('icons/effects/effects.dmi',icon_state = "thermite")
+ 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
@@ -921,8 +931,9 @@ datum
reaction_turf(var/turf/T, var/volume)
src = null
- if(!istype(T, /turf/space))
- new /obj/effect/decal/cleanable/greenglow(T)
+ if(volume >= 3)
+ if(!istype(T, /turf/space))
+ new /obj/effect/decal/cleanable/greenglow(T)
aluminum
name = "Aluminum"
@@ -986,13 +997,14 @@ datum
if(O)
O.clean_blood()
reaction_turf(var/turf/T, var/volume)
- T.overlays = null
- T.clean_blood()
- for(var/obj/effect/decal/cleanable/C in src)
- del(C)
+ if(volume >= 1)
+ T.overlays = null
+ T.clean_blood()
+ for(var/obj/effect/decal/cleanable/C in src)
+ del(C)
- for(var/mob/living/carbon/metroid/M in T)
- M.adjustToxLoss(rand(5,10))
+ for(var/mob/living/carbon/metroid/M in T)
+ M.adjustToxLoss(rand(5,10))
reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
if(iscarbon(M))
@@ -2626,8 +2638,9 @@ datum
return
reaction_turf(var/turf/simulated/T, var/volume)
- if(!istype(T)) return
- T.Bless()
+ if(volume >= 3)
+ if(!istype(T)) return
+ T.Bless()
tequilla
name = "Tequila"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index a6c3b6a95a2..7e3886aa804 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/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
/*
diff --git a/html/changelog.html b/html/changelog.html
index dafb6d1f3b4..116c6dafc10 100644
--- a/html/changelog.html
+++ b/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. -->
+
+
30 August 2012
+
Giacom updated:
+
+ - 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!
+ - 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."
-
+
- The EMP kit, that you can buy through the uplink, has two more grenades in them now. Making the box full of EMP grenades!
+ - Changed the EMP grenade's range to be much bigger.
+
+
29 August 2012
Nodrak updated: