From bea206fad75964d5ea90f9e7bd00c4eff302bc3e Mon Sep 17 00:00:00 2001
From: ShiftyRail <31417754+ShiftyRail@users.noreply.github.com>
Date: Wed, 8 Aug 2018 22:55:45 +0200
Subject: [PATCH] Posibrains emote oversights (#19208)

* Posibrains emote oversights

* Whoops

* "Helpers"
---
 code/modules/mob/emote.dm                | 4 ++--
 code/modules/mob/living/silicon/emote.dm | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 1652ab35022..c98c0f93a50 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -19,7 +19,7 @@
 	key_third_person = "flips"
 	restraint_check = TRUE
 	mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer)
-	mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai)
+	mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai, /mob/living/carbon/brain)
 	mob_type_ignore_stat_typelist = list(/mob/dead/observer)
 
 /datum/emote/flip/run_emote(mob/user, params)
@@ -36,7 +36,7 @@
 	key_third_person = "spins"
 	restraint_check = TRUE
 	mob_type_allowed_typelist = list(/mob/living, /mob/dead/observer)
-	mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai)
+	mob_type_blacklist_typelist = list(/mob/living/silicon/ai, /mob/living/silicon/pai, /mob/living/carbon/brain)
 	mob_type_ignore_stat_typelist = list(/mob/dead/observer)
 
 /datum/emote/spin/run_emote(mob/user)
diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm
index 1d8622e884c..ec8cfc6c75d 100644
--- a/code/modules/mob/living/silicon/emote.dm
+++ b/code/modules/mob/living/silicon/emote.dm
@@ -5,13 +5,15 @@
 	var/pai_software_required
 
 /datum/emote/sound/silicon
-	mob_type_allowed_typelist = list(/mob/living/silicon)
+	mob_type_allowed_typelist = list(/mob/living/silicon, /mob/living/carbon/brain)
 	emote_type = EMOTE_AUDIBLE
 	var/module_quirk_required
 	var/pai_software_required
 
 /datum/emote/sound/silicon/can_run_emote(var/mob/user, var/status_check = TRUE)
 	. = ..()
+	if (. && isbrain(user) && !module_quirk_required)
+		return TRUE
 	if (. && isAI(user) && !module_quirk_required)
 		return TRUE
 	var/mob/living/silicon/pai/the_pai = user