From dacbca746c9507775632f815cc6cd3fb6326e5b5 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sat, 8 Oct 2016 19:38:49 -0500
Subject: [PATCH] Fixes low-yield EMP grenades

---
 .../items/weapons/grenades/emgrenade.dm       | 12 +++----
 html/changelogs/Anewbe - EMP grenades.yml     | 36 +++++++++++++++++++
 2 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/Anewbe - EMP grenades.yml

diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index 43b954c76ab..dd1d6a55b02 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -3,10 +3,12 @@
 	icon_state = "emp"
 	item_state = "empgrenade"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)
+	var/emp_heavy = 4
+	var/emp_light = 10
 
 	prime()
 		..()
-		if(empulse(src, 4, 10))
+		if(empulse(src, emp_heavy, emp_light))
 			qdel(src)
 		return
 
@@ -15,9 +17,5 @@
 	desc = "A weaker variant of the EMP grenade"
 	icon_state = "lyemp"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)
-
-	prime()
-		..()
-		if(empulse(src, 4, 1))
-			qdel(src)
-		return
\ No newline at end of file
+	emp_heavy = 1
+	emp_light = 4
\ No newline at end of file
diff --git a/html/changelogs/Anewbe - EMP grenades.yml b/html/changelogs/Anewbe - EMP grenades.yml
new file mode 100644
index 00000000000..a13cc07b559
--- /dev/null
+++ b/html/changelogs/Anewbe - EMP grenades.yml	
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Anewbe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Low Yield EMP grenades now have the proper EMP radii."