From 46c99cca038e1b86b07c9a6dee247dcf86f22763 Mon Sep 17 00:00:00 2001
From: Cyantime <Cyantime@users.noreply.github.com>
Date: Sun, 7 Jan 2018 22:09:43 -0500
Subject: [PATCH] Improves medibot speaker switch

---
 code/modules/mob/living/bot/medbot.dm | 51 ++++++++++++++-------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 635eabf2f2..7812115e76 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -54,14 +54,15 @@
 		if(confirmTarget(H))
 			target = H
 			if(last_newpatient_speak + 30 SECONDS < world.time)
-				var/message_options = list(
-					"Hey, [H.name]! Hold on, I'm coming." = 'sound/voice/medbot/mcoming.ogg',
-					"Wait [H.name]! I want to help!" = 'sound/voice/medbot/mhelp.ogg',
-					"[H.name], you appear to be injured!" = 'sound/voice/medbot/minjured.ogg'
-					)
-				var/message = pick(message_options)
-				say(message)
-				playsound(loc, message_options[message], 50, 0)
+				if(vocal)
+					var/message_options = list(
+						"Hey, [H.name]! Hold on, I'm coming." = 'sound/voice/medbot/mcoming.ogg',
+						"Wait [H.name]! I want to help!" = 'sound/voice/medbot/mhelp.ogg',
+						"[H.name], you appear to be injured!" = 'sound/voice/medbot/minjured.ogg'
+						)
+					var/message = pick(message_options)
+					say(message)
+					playsound(loc, message_options[message], 50, 0)
 				custom_emote(1, "points at [H.name].")
 				last_newpatient_speak = world.time
 			break
@@ -97,29 +98,31 @@
 		visible_message("<span class='warning'>[src] injects [H] with the syringe!</span>")
 
 	if(H.stat == DEAD) // This is down here because this proc won't be called again due to losing a target because of parent AI loop.
-		var/death_messages = list(
-			"No! Stay with me!" = 'sound/voice/medbot/mno.ogg',
-			"Live, damnit! LIVE!" = 'sound/voice/medbot/mlive.ogg',
-			"I... I've never lost a patient before. Not today, I mean." = 'sound/voice/medbot/mlost.ogg'
-			)
-		var/message = pick(death_messages)
-		say(message)
-		playsound(loc, death_messages[message], 50, 0)
 		target = null
+		if(vocal)
+			var/death_messages = list(
+				"No! Stay with me!" = 'sound/voice/medbot/mno.ogg',
+				"Live, damnit! LIVE!" = 'sound/voice/medbot/mlive.ogg',
+				"I... I've never lost a patient before. Not today, I mean." = 'sound/voice/medbot/mlost.ogg'
+				)
+			var/message = pick(death_messages)
+			say(message)
+			playsound(loc, death_messages[message], 50, 0)
 
 	// This is down here for the same reason as above.
 	else
 		t = confirmTarget(H)
 		if(!t)
-			var/possible_messages = list(
-				"All patched up!" = 'sound/voice/medbot/mpatchedup.ogg',
-				"An apple a day keeps me away." = 'sound/voice/medbot/mapple.ogg',
-				"Feel better soon!" = 'sound/voice/medbot/mfeelbetter.ogg'
-				)
-			var/message = pick(possible_messages)
-			say(message)
-			playsound(loc, possible_messages[message], 50, 0)
 			target = null
+			if(vocal)
+				var/possible_messages = list(
+					"All patched up!" = 'sound/voice/medbot/mpatchedup.ogg',
+					"An apple a day keeps me away." = 'sound/voice/medbot/mapple.ogg',
+					"Feel better soon!" = 'sound/voice/medbot/mfeelbetter.ogg'
+					)
+				var/message = pick(possible_messages)
+				say(message)
+				playsound(loc, possible_messages[message], 50, 0)
 
 	busy = 0
 	update_icons()