Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

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

@@ -57,14 +57,19 @@
 		src.brainmob.real_name = "PBU-[rand(100, 999)]"
 		src.brainmob.loc = src
 		src.brainmob.container = src
+		src.brainmob.robot_talk_understand = 1
 		src.brainmob.stat = 0
 		src.brainmob.silent = 0
 		src.brainmob.brain_op_stage = 4.0
 		src.brainmob.key = candidate.key
-
 		dead_mob_list -= src.brainmob
 		living_mob_list += src.brainmob
 
+		src.brainmob << "<b>You are a positronic brain, brought into existence on [station_name()].</b>"
+		src.brainmob << "<b>As a synthetic intelligence, you answer to all crewmembers, as well as the AI.</b>"
+		src.brainmob << "Use say :b to speak to other artificial intelligences on the station."
+		src.brainmob.mind.assigned_role = "Positronic Brain"
+
 		var/turf/T = get_turf_or_move(src.loc)
 		for (var/mob/M in viewers(T))
 			M.show_message("\blue The positronic brain chimes quietly.")
@@ -99,7 +104,6 @@
 				if(!src.brainmob.client)	msg += "It appears to be in stand-by mode.\n" //afk
 			if(UNCONSCIOUS)		msg += "<span class='warning'>It doesn't seem to be responsive.</span>\n"
 			if(DEAD)			msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
-	else
 	msg += "<span class='info'>*---------*</span>"
 	usr << msg
 	return

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

@@ -5,6 +5,11 @@
 	if(!(container && (istype(container, /obj/item/device/mmi) || istype(container, /obj/item/device/posibrain))))
 		return //No MMI, can't speak, bucko./N
 	else
+		if ((copytext(message, 1, 3) == ":b") || (copytext(message, 1, 3) == ":B") && (container && istype(container, /obj/item/device/posibrain)))
+			message = copytext(message, 3)
+			message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+			robot_talk(message)
+			return
 		if(prob(emp_damage*4))
 			if(prob(10))//10% chane to drop the message entirely
 				return

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

@@ -53,7 +53,7 @@
 	var/lockcharge //Used when locking down a borg to preserve cell charge
 	var/speed = 0 //Cause sec borgs gotta go fast //No they dont!
 	var/scrambledcodes = 0 // Used to determine if a borg shows up on the robotics console.  Setting to one hides them.
-
+	var/braintype = "Cyborg"
 
 /mob/living/silicon/robot/New(loc,var/syndie = 0)
 	spark_system = new /datum/effect/effect/system/spark_spread()
@@ -195,11 +195,16 @@
 
 /mob/living/silicon/robot/proc/updatename(var/prefix as text)
 
+	if(istype(mmi, /obj/item/device/posibrain))
+		braintype = "Android"
+	else
+		braintype = "Cyborg"
+
 	var/changed_name = ""
 	if(custom_name)
 		changed_name = custom_name
 	else
-		changed_name = "[(prefix ? "[prefix] " : "")]Cyborg-[num2text(ident)]"
+		changed_name = "[(prefix ? "[prefix] " : "")][braintype]-[num2text(ident)]"
 	real_name = changed_name
 	name = real_name
 

code/modules/research/designs.dm

@@ -587,6 +587,16 @@ datum/design/paicard
 	materials = list("$glass" = 500, "$metal" = 500)
 	build_path = "/obj/item/device/paicard"
 
+datum/design/paicard
+	name = "Positronic Brain"
+	desc = "Allows for the construction of a positronic brain"
+	id = "posibrain"
+	req_tech = list("engineering" = 4, "materials" = 4, "bluespace" = 2, "programming" = 6)
+
+	build_type = PROTOLATHE
+	materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$plasma" = 500, "$diamond" = 100)
+	build_path = "/obj/item/device/posibrain"
+
 ///////////////////////////////////
 //////////Mecha Module Disks///////
 ///////////////////////////////////