Merge branch 'pumpkin_head' of https://github.com/alsoandanswer/Aurora.3 into pumpkin_head

code/game/objects/items/trash.dm

@@ -55,6 +55,9 @@
 	name = "plate"
 	icon_state = "plate"
 
+/obj/item/trash/plate/steak
+	icon_state = "steak"
+
 /obj/item/trash/snack_bowl
 	name = "snack bowl"
 	icon_state	= "snack_bowl"

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

@@ -32,7 +32,7 @@
 			S.icon_state = "shield0"
 
 	to_chat(M, "<span class='danger'>BANG</span>")
-	playsound(src.loc, 'sound/weapons/flashbang.ogg', 50, 1, 5, 0.9, 1)
+	playsound(src.loc, 'sound/weapons/flashbang.ogg', 50, 1, 3, 0.5, 1)
 
 //Checking for protections
 	var/eye_safety = 0