From 0e60f213523a34ae63743e27a501bfb8aded4b23 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Tue, 31 Mar 2020 21:05:11 +0200
Subject: [PATCH] Removes the flashbang stun. (#8546)

I hate security.
---
 .../items/weapons/grenades/flashbang.dm       |  7 +---
 html/changelogs/mattatlas-flashbanbegone.yml  | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/mattatlas-flashbanbegone.yml

diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 2f4ed17554c..fb5c30709b1 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -51,7 +51,6 @@
 //Flashing everyone
 	if(eye_safety < FLASH_PROTECTION_MODERATE)
 		flick("e_flash", M.flash)
-		M.Stun(2)
 		M.Weaken(10)
 			//Vaurca damage 15/01/16
 		var/mob/living/carbon/human/H = M
@@ -65,10 +64,8 @@
 //Now applying sound
 	if((get_dist(M, T) <= 2 || src.loc == M.loc || src.loc == M))
 		if(ear_safety > 0)
-			M.Stun(2)
 			M.Weaken(1)
 		else
-			M.Stun(10)
 			M.Weaken(3)
 			if ((prob(14) || (M == src.loc && prob(70))))
 				M.ear_damage += rand(1, 10)
@@ -78,13 +75,11 @@
 
 	else if(get_dist(M, T) <= 5)
 		if(!ear_safety)
-			M << sound('sound/weapons/flash_ring.ogg',0,1,0,100)
-			M.Stun(8)
+			sound_to(M, sound('sound/weapons/flash_ring.ogg',0,1,0,100))
 			M.ear_damage += rand(0, 3)
 			M.ear_deaf = max(M.ear_deaf,10)
 
 	else if(!ear_safety)
-		M.Stun(4)
 		M.ear_damage += rand(0, 1)
 		M.ear_deaf = max(M.ear_deaf,5)
 
diff --git a/html/changelogs/mattatlas-flashbanbegone.yml b/html/changelogs/mattatlas-flashbanbegone.yml
new file mode 100644
index 00000000000..4b9e906e9e3
--- /dev/null
+++ b/html/changelogs/mattatlas-flashbanbegone.yml
@@ -0,0 +1,41 @@
+################################
+# 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
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: MattAtlas
+
+# 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: 
+  - tweak: "Flashbangs no longer stun people."