From ebb89d6c597f5f415eed4cbc657a5a552d03c840 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sun, 30 Sep 2018 00:44:39 -0700
Subject: [PATCH] Merge pull request #5614 from Anewbe/autospray

Hyposprays can now have different sounds
---
 code/modules/reagents/reagent_containers/hypospray.dm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 724cee9a6fb..3cfac06de15 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -17,6 +17,7 @@
 	preserve_item = 1
 	var/filled = 0
 	var/list/filled_reagents = list()
+	var/hyposound	// What sound do we play on use?
 
 /obj/item/weapon/reagent_containers/hypospray/New()
 	..()
@@ -55,8 +56,9 @@
 	user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
 	to_chat(user, "<span class='notice'>You inject [M] with \the [src].</span>")
 	to_chat(M, "<span class='notice'>You feel a tiny prick!</span>")
-	
-	playsound(src, 'sound/effects/hypospray.ogg',25)
+
+	if(hyposound)
+		playsound(src, hyposound,25)
 
 	if(M.reagents)
 		var/contained = reagentlist()
@@ -126,6 +128,7 @@
 	filled = 1
 	filled_reagents = list("inaprovaline" = 5)
 	preserve_item = 0
+	hyposound = 'sound/effects/hypospray.ogg'
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/on_reagent_change()
 	..()