From 2cd59d7154d747d8462e63b4a230ba3a159f6c86 Mon Sep 17 00:00:00 2001
From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
Date: Thu, 20 Feb 2020 14:14:42 +0000
Subject: [PATCH] Arrivals computer will no longer announce afk MMIs (#8312)

---
 code/modules/mob/mob_helpers.dm          | 5 +++++
 code/modules/shuttles/shuttle_arrival.dm | 2 ++
 html/changelogs/no_mmi_announcement.yml  | 6 ++++++
 3 files changed, 13 insertions(+)
 create mode 100644 html/changelogs/no_mmi_announcement.yml

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 667379c96c9..858d599b7d4 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -19,6 +19,11 @@
 /mob/living/carbon/human/proc/isFBP()
 	return species && (species.appearance_flags & HAS_FBP)
 
+/proc/isMMI(A)
+	if(isbrain(A))
+		var/mob/living/carbon/brain/B = A
+		return istype(B.container, /obj/item/device/mmi)
+
 /mob/living/bot/isSynthetic()
 	return 1
 
diff --git a/code/modules/shuttles/shuttle_arrival.dm b/code/modules/shuttles/shuttle_arrival.dm
index 30e74a31357..3523ae37c42 100644
--- a/code/modules/shuttles/shuttle_arrival.dm
+++ b/code/modules/shuttles/shuttle_arrival.dm
@@ -40,6 +40,8 @@
 						mobstoyellat -= A
 					else if(!ishuman(A) && SSarrivals.failreturnnumber >=4 && !A.client) // remove non-player mobs to keep things rolling
 						qdel(A)
+					else if(issilicon(A.loc) && isMMI(A))
+						mobstoyellat -= A
 				if (mobstoyellat)
 					global_announcer.autosay("Current life-forms on shuttle: [english_list(mobstoyellat)].", "Arrivals Shuttle Oversight") // tell on them
 			return
diff --git a/html/changelogs/no_mmi_announcement.yml b/html/changelogs/no_mmi_announcement.yml
new file mode 100644
index 00000000000..91f67c2fccb
--- /dev/null
+++ b/html/changelogs/no_mmi_announcement.yml
@@ -0,0 +1,6 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Robots won't separately have their MMIs announced by the Arrivals Shuttle Oversight."
\ No newline at end of file