Merge remote-tracking branch 'upstream/master' into cool-ipcs

2020-09-16 05:12:20 +01:00
parent 0d8374a328 604020c4bc
commit 12bf3aebda
635 changed files with 23608 additions and 12861 deletions
@@ -1,13 +1,3 @@
-/datum/emote/brain
-	mob_type_allowed_typecache = list(/mob/living/brain)
-	mob_type_blacklist_typecache = list()
-
-/datum/emote/brain/can_run_emote(mob/user, status_check = TRUE)
-	. = ..()
-	var/mob/living/brain/B = user
-	if(!istype(B) || (!(B.container && istype(B.container, /obj/item/mmi))))
-		return FALSE
-
 /datum/emote/brain/alarm
 	key = "alarm"
 	message = "sounds an alarm."