From 86cc28dd57d5f43102f5b8b73e1597be4b00c284 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Tue, 19 Mar 2013 14:37:21 +0400 Subject: [PATCH] Fixed posibrain installed into spiderbot bug, made posibrains a child class of MMI. --- code/game/machinery/computer/ai_core.dm | 2 +- code/game/mecha/mecha.dm | 4 +-- code/game/objects/items/robot/robot_parts.dm | 2 +- .../mob/living/carbon/brain/posibrain.dm | 27 ++++++++++--------- code/modules/mob/living/carbon/brain/say.dm | 4 +-- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../simple_animal/friendly/spiderbot.dm | 2 +- maps/tgstation.2.1.0.0.1.dmm | 2 +- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 939b87aa7f..f24d0ce2b8 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -117,7 +117,7 @@ laws.add_inherent_law(M.newFreeFormLaw) usr << "Added a freeform law." - if(istype(P, /obj/item/device/mmi) || istype(P, /obj/item/device/posibrain)) + if(istype(P, /obj/item/device/mmi) || istype(P, /obj/item/device/mmi/posibrain)) if(!P:brainmob) user << "\red Sticking an empty [P] into the frame would sort of defeat the purpose." return diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 225318a9b8..d70512148c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -651,7 +651,7 @@ /obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/posibrain)) + if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain)) if(mmi_move_inside(W,user)) user << "[src]-MMI interface initialized successfuly" else @@ -1136,7 +1136,7 @@ src.occupant.client.perspective = MOB_PERSPECTIVE */ src.occupant << browse(null, "window=exosuit") - if(istype(mob_container, /obj/item/device/mmi) || istype(mob_container, /obj/item/device/posibrain)) + if(istype(mob_container, /obj/item/device/mmi) || istype(mob_container, /obj/item/device/mmi/posibrain)) var/obj/item/device/mmi/mmi = mob_container if(mmi.brainmob) occupant.loc = mmi diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 62dfb126bf..b410785563 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -161,7 +161,7 @@ else user << "\blue You need to attach a flash to it first!" - if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/posibrain)) + if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain)) var/obj/item/device/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index fe3a0db56c..8ed5860ecf 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -1,4 +1,4 @@ -/obj/item/device/posibrain +/obj/item/device/mmi/posibrain name = "positronic brain" desc = "A cube of shining metal, four inches to a side and covered in shallow grooves." icon = 'icons/obj/assemblies.dmi' @@ -6,14 +6,15 @@ w_class = 3 origin_tech = "engineering=4;materials=4;bluespace=2;programming=4" - var/list/construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"plasma"=100,"diamond"=10) - var/construction_time = 75 + construction_cost = list("metal"=500,"glass"=500,"silver"=200,"gold"=200,"plasma"=100,"diamond"=10) + construction_time = 75 var/searching = 0 var/askDelay = 10 * 60 * 1 - var/mob/living/carbon/brain/brainmob = null + mob/living/carbon/brain/brainmob = null req_access = list(access_robotics) - var/locked = 0 - var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm. + locked = 0 + mecha = null//This does not appear to be used outside of reference in mecha.dm. + attack_self(mob/user as mob) if(!brainmob.key && searching == 0) @@ -73,7 +74,7 @@ for (var/mob/M in viewers(T)) M.show_message("\blue The positronic brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?") -/obj/item/device/posibrain/examine() +/obj/item/device/mmi/posibrain/examine() set src in oview() @@ -97,20 +98,20 @@ usr << msg return -/obj/item/device/posibrain/emp_act(severity) - if(!brainmob) +/obj/item/device/mmi/posibrain/emp_act(severity) + if(!src.brainmob) return else switch(severity) if(1) - brainmob.emp_damage += rand(20,30) + src.brainmob.emp_damage += rand(20,30) if(2) - brainmob.emp_damage += rand(10,20) + src.brainmob.emp_damage += rand(10,20) if(3) - brainmob.emp_damage += rand(0,10) + src.brainmob.emp_damage += rand(0,10) ..() -/obj/item/device/posibrain/New() +/obj/item/device/mmi/posibrain/New() src.brainmob = new(src) src.brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]" diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index de169087b4..159f899f89 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -2,10 +2,10 @@ if (silent) return - if(!(container && (istype(container, /obj/item/device/mmi) || istype(container, /obj/item/device/posibrain)))) + if(!(container && (istype(container, /obj/item/device/mmi) || istype(container, /obj/item/device/mmi/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))) + if ((copytext(message, 1, 3) == ":b") || (copytext(message, 1, 3) == ":B") && (container && istype(container, /obj/item/device/mmi/posibrain))) message = copytext(message, 3) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) robot_talk(message) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b82f7b1d98..5415ba9900 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -194,7 +194,7 @@ /mob/living/silicon/robot/proc/updatename(var/prefix as text) - if(istype(mmi, /obj/item/device/posibrain)) + if(istype(mmi, /obj/item/device/mmi/posibrain)) braintype = "Android" else braintype = "Cyborg" diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 9a01fc3ff8..7a43f0a75e 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -43,7 +43,7 @@ /mob/living/simple_animal/spiderbot/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(istype(O, /obj/item/device/mmi) || istype(O, /obj/item/device/posibrain)) + if(istype(O, /obj/item/device/mmi) || istype(O, /obj/item/device/mmi/posibrain)) var/obj/item/device/mmi/B = O if(src.mmi) //There's already a brain in it. user << "\red There's already a brain in [src]!" diff --git a/maps/tgstation.2.1.0.0.1.dmm b/maps/tgstation.2.1.0.0.1.dmm index 77001d4fe8..08f6538812 100644 --- a/maps/tgstation.2.1.0.0.1.dmm +++ b/maps/tgstation.2.1.0.0.1.dmm @@ -3066,7 +3066,7 @@ "bgX" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/medical/research{name = "Research Division"}) "bgY" = (/obj/structure/table,/obj/item/stack/sheet/glass{amount = 50; pixel_x = 3; pixel_y = 3},/obj/item/stack/sheet/metal{amount = 50},/obj/item/clothing/glasses/welding,/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/toxins/lab) "bgZ" = (/obj/structure/stool,/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/toxins/lab) -"bha" = (/obj/structure/table,/obj/item/device/posibrain,/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/toxins/lab) +"bha" = (/obj/structure/table,/obj/item/device/mmi/posibrain,/turf/simulated/floor{dir = 1; icon_state = "whitepurple"},/area/toxins/lab) "bhb" = (/obj/machinery/camera{c_tag = "Research and Development"; dir = 2; network = list("RD"); pixel_x = 22},/obj/machinery/camera{c_tag = "Research and Development Lab"; dir = 2},/obj/machinery/power/apc{dir = 1; name = "Research Lab APC"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor{dir = 1; icon_state = "whitepurplecorner"},/area/toxins/lab) "bhc" = (/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bhd" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)