Merge pull request #622 from SkyMarshal/master

Fixed headsets, made the AI so you can unbolt it and have an awesome pal.
This commit is contained in:
Albert Iordache
2012-03-04 10:44:11 -08:00
3 changed files with 23 additions and 2 deletions
+1 -1
View File
@@ -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
+21
View File
@@ -96,6 +96,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"