From 743ab9a488ef8a08dca0a211bbbc46d31d0c4c43 Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@users.noreply.github.com>
Date: Thu, 25 Jun 2020 17:50:49 -0400
Subject: [PATCH] Fixes bank cards not giving alerts if a mob is around that
 has them disabled (#51825)

---
 code/modules/economy/account.dm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm
index 151868c34fd..a16c12eec25 100644
--- a/code/modules/economy/account.dm
+++ b/code/modules/economy/account.dm
@@ -78,25 +78,29 @@
 				icon_source = id_card.get_cached_flat_icon()
 		var/mob/card_holder = recursive_loc_check(A, /mob)
 		if(ismob(card_holder)) //If on a mob
-			if(card_holder.client && !(card_holder.client.prefs.chat_toggles & CHAT_BANKCARD) && !force)
+			if(!card_holder.client || (!(card_holder.client.prefs.chat_toggles & CHAT_BANKCARD) && !force))
 				return
 
-			card_holder.playsound_local(get_turf(card_holder), 'sound/machines/twobeep_high.ogg', 50, TRUE)
 			if(card_holder.can_hear())
+				card_holder.playsound_local(get_turf(card_holder), 'sound/machines/twobeep_high.ogg', 50, TRUE)
 				to_chat(card_holder, "[icon2html(icon_source, card_holder)] <span class='notice'>[message]</span>")
 		else if(isturf(A.loc)) //If on the ground
-			for(var/mob/M in hearers(1,get_turf(A)))
-				if(M.client && !(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force)
-					return
-				playsound(A, 'sound/machines/twobeep_high.ogg', 50, TRUE)
-				A.audible_message("[icon2html(icon_source, hearers(A))] <span class='notice'>[message]</span>", null, 1)
-				break
-		else
-			for(var/mob/M in A.loc) //If inside a container with other mobs (e.g. locker)
-				if(M.client && !(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force)
-					return
-				M.playsound_local(get_turf(M), 'sound/machines/twobeep_high.ogg', 50, TRUE)
+			var/turf/T = A.loc
+			for(var/mob/M in hearers(1,T))
+				if(!M.client || (!(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force))
+					continue
 				if(M.can_hear())
+					M.playsound_local(T, 'sound/machines/twobeep_high.ogg', 50, TRUE)
+					to_chat(M, "[icon2html(icon_source, M)] <span class='notice'>[message]</span>")
+		else
+			var/atom/sound_atom
+			for(var/mob/M in A.loc) //If inside a container with other mobs (e.g. locker)
+				if(!M.client || (!(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force))
+					continue
+				if(!sound_atom)
+					sound_atom = A.drop_location() //in case we're inside a bodybag in a crate or something. doing this here to only process it if there's a valid mob who can hear the sound.
+				if(M.can_hear())
+					M.playsound_local(get_turf(sound_atom), 'sound/machines/twobeep_high.ogg', 50, TRUE)
 					to_chat(M, "[icon2html(icon_source, M)] <span class='notice'>[message]</span>")
 
 /datum/bank_account/department