From 6ad09d49c81d5d9ebc7c671c6dab5bc5f99d346c Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 16 Feb 2013 14:21:00 -0800 Subject: [PATCH 1/2] Fixes for posibrain name generation, research design for protolathe, possible for for double-say for posibrains (cannot test locally). --- code/modules/mob/living/carbon/brain/posibrain.dm | 9 ++++++--- code/modules/mob/living/silicon/say.dm | 6 +++--- code/modules/research/designs.dm | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index b6894719a10..b972e2f9f80 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -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 << "You are a positronic brain, brought into existence on [station_name()]." src.brainmob << "As a synthetic intelligence, you answer to all crewmembers, as well as the AI." src.brainmob << "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm." - src.brainmob << "Use say :b to speak to other artificial intelligences." + src.brainmob << "Use say :b to speak to other artificial intelligences." 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 += "It doesn't seem to be responsive.\n" if(DEAD) msg += "It appears to be completely inactive.\n" + else + msg += "It appears to be completely inactive.\n" msg += "*---------*" usr << msg return diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index d9be362445a..712a7f6e5cd 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -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) @@ -127,8 +127,8 @@ message = say_quote(message) - rendered = "Robotic Talk, [name] [message_a]" + rendered = "Robotic Talk (4), [name] [message_a]" 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) \ No newline at end of file diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index bffa66a303d..0fd82e0b38a 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -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) From 4dd7141e321768e17efe4fc884b4b42c8503e1c2 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 16 Feb 2013 16:19:39 -0800 Subject: [PATCH 2/2] Removing a debug string. --- code/modules/mob/living/silicon/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 712a7f6e5cd..1c2adbf7a6e 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -127,7 +127,7 @@ message = say_quote(message) - rendered = "Robotic Talk (4), [name] [message_a]" + rendered = "Robotic Talk, [name] [message_a]" for (var/mob/M in dead_mob_list) if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping