From 71ca4efcbc3d6f0bae454847ec3c159940804d8a Mon Sep 17 00:00:00 2001 From: "sieve32@gmail.com" Date: Sun, 8 Jul 2012 06:40:33 +0000 Subject: [PATCH] -Cleaned up and improved PA icons -Fixed an unlisted issue involving RD consoles. Now you can use a screwdriver to change the access protocols on the board itself, to be either a core console or robotics one -Fixed Issue 546, the part of the AIize() that cleared the music was a part of human code, but at round-start it is 'new_player' that is AIized. Moved that part to mob/AIize() git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4014 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/computer/buildandrepair.dm | 14 +++++++++++++- code/modules/mob/transform_procs.dm | 3 +-- .../particle_accelerator/particle_control.dm | 8 ++++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 088f5e20786..ebb2208b10d 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -132,7 +132,7 @@ build_path = "/obj/machinery/computer/prisoner" /obj/item/weapon/circuitboard/rdconsole name = "Circuit Board (RD Console)" - build_path = "/obj/machinery/computer/rdconsole" + build_path = "/obj/machinery/computer/rdconsole/core" /obj/item/weapon/circuitboard/mecha_control name = "Circuit Board (Exosuit Control Console)" build_path = "/obj/machinery/computer/mecha" @@ -228,6 +228,18 @@ user << "DERP! BUG! Report this (And what you were doing to cause it) to Agouri" return +/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/weapon/screwdriver)) + if(src.build_path == "/obj/machinery/computer/rdconsole/core") + src.name = "Circuit Board (RD Console - Robotics)" + src.build_path = "/obj/machinery/computer/rdconsole/robotics" + user << "\blue Access protocols succesfully updated." + else + src.name = "Circuit Board (RD Console)" + src.build_path = "/obj/machinery/computer/rdconsole/core" + user << "\blue Defaulting access protocols." + return + /obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob) switch(state) if(0) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 52ba006dada..447e837d6b7 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -55,8 +55,6 @@ for(var/t in organs) del(t) - if(client) - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs return ..() /mob/living/carbon/AIize() @@ -74,6 +72,7 @@ /mob/proc/AIize() if(client) client.screen.len = null + src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs var/mob/living/silicon/ai/O = new (loc, /datum/ai_laws/asimov,,1)//No MMI but safety is in effect. O.invisibility = 0 O.aiRestorePowerRoutine = 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index fcce4509281..24c93e18294 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -33,6 +33,10 @@ use_power = 0 assembled = 0 active = 0 + for(var/obj/structure/particle_accelerator/part in connected_parts) + part.strength = null + part.powered = 0 + part.update_icon() connected_parts = list() return if(!part_scan()) @@ -63,10 +67,6 @@ icon_state = "[reference]c" return - update_icon() - ..() - return - Topic(href, href_list) ..() //Ignore input if we are broken, !silicon guy cant touch us, or nonai controlling from super far away