Merge pull request #2354 from Zuhayr/master

Posibrain fixes (double name, protolathe, double binary)
This commit is contained in:
Chinsky
2013-02-16 02:22:47 -08:00
3 changed files with 10 additions and 7 deletions
@@ -54,8 +54,9 @@
src.brainmob = B
src.brainmob.mind = candidate.mind
src.brainmob.name = "PBU-[rand(100, 999)]"
src.brainmob.real_name = "PBU-[rand(100, 999)]"
src.brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
src.brainmob.real_name = src.brainmob.name
src.name = "positronic brain ([src.brainmob.name])"
src.brainmob.loc = src
src.brainmob.container = src
src.brainmob.robot_talk_understand = 1
@@ -69,7 +70,7 @@
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 << "<b>Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.</b>"
src.brainmob << "Use say :b to speak to other artificial intelligences."
src.brainmob << "<b>Use say :b to speak to other artificial intelligences.</b>"
src.brainmob.mind.assigned_role = "Positronic Brain"
var/turf/T = get_turf_or_move(src.loc)
@@ -106,6 +107,8 @@
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='deadsay'>It appears to be completely inactive.</span>\n"
msg += "<span class='info'>*---------*</span>"
usr << msg
return
+2 -2
View File
@@ -106,7 +106,7 @@
var/list/listening = hearers(1, src)
listening -= src
listening += src
//listening += src
var/list/heard = list()
for (var/mob/M in listening)
@@ -130,5 +130,5 @@
rendered = "<i><span class='game say'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[message_a]</span></span></i>"
for (var/mob/M in dead_mob_list)
if(!istype(M,/mob/new_player) && !(istype(M,/mob/living/carbon/brain)))//No meta-evesdropping
if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping
M.show_message(rendered, 2)
+2 -2
View File
@@ -587,11 +587,11 @@ datum/design/paicard
materials = list("$glass" = 500, "$metal" = 500)
build_path = "/obj/item/device/paicard"
datum/design/paicard
datum/design/posibrain
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)
req_tech = list("engineering" = 4, "materials" = 6, "bluespace" = 2, "programming" = 4)
build_type = PROTOLATHE
materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$plasma" = 500, "$diamond" = 100)