From f42355282d58841644a75eb548612b21b1ebd520 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sun, 4 Mar 2012 11:39:43 -0700 Subject: [PATCH] Fixed headsets, made the AI so you can unbolt it and have an awesome pal. --- .../WorkInProgress/Cael_Aislinn/Tajara/say.dm | 2 +- code/modules/mob/living/say.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 21 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm index b36bbb5bdbc..caa36b7a0f4 100644 --- a/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm +++ b/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm @@ -190,7 +190,7 @@ if( !message_mode && (disease_symptoms & DISEASE_WHISPER)) message_mode = "whisper" - if(src.stunned > 0 || (!(traumatic_shock > 61) && prob(50))) + if(src.stunned > 0 || (traumatic_shock > 61 && prob(50))) message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 3339524a47e..d9637aafeca 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -153,7 +153,7 @@ if( !message_mode && (disease_symptoms & DISEASE_WHISPER)) message_mode = "whisper" - if(src.stunned > 0 || (!(traumatic_shock > 61) && prob(50))) + if(src.stunned > 0 || (traumatic_shock > 61 && prob(50))) message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index f13df7c621a..f82af97938f 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -95,6 +95,27 @@ return +/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/wrench)) + if(anchored) + user.visible_message("\blue [user] starts to unbolt [src] from the plating...") + if(!do_after(user,40)) + user.visible_message("\blue [user] decides not to unbolt [src]") + return + user.visible_message("\blue [user] finishes unfastening [src]") + anchored = 0 + return + else + user.visible_message("\blue [user] starts to bolt [src] to the plating...") + if(!do_after(user,40)) + user.visible_message("\blue [user] decides not to bolt [src]") + return + user.visible_message("\blue [user] finishes fastening down [src]") + anchored = 1 + return + else + return ..() + /mob/living/silicon/ai/verb/pick_icon() set category = "AI Commands"