Merge branch 'master' into development

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -33,6 +33,9 @@
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "chitin"
 
+/obj/item/organ/brain/xeno/gain_trauma()
+	return
+	
 /obj/item/organ/brain/Initialize(mapload)
 	. = ..()
 	health = config.default_brain_health

code/modules/mob/living/silicon/robot/emote.dm

@@ -196,7 +196,7 @@
 
 		if("halt")
 			if (istype(module,/obj/item/weapon/robot_module/security))
-				message = "<B>[src]</B>'s speakers skreech, \"Halt! Security!\"."
+				message = "'s speakers skreech, \"Halt! Security!\"."
 
 				playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)
 				m_type = 2