From cfd5cff35282f3d87b58c9ef758aa9ee843cfda0 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Sun, 29 Jul 2012 04:09:40 +0000 Subject: [PATCH] The 'Check AI Laws' verb now shows which AI (if any) the cyborgs are synced to. Fix for a runtime due to an attack_verb being a string instead of a list. (You can once again robust people with toolboxes!) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4210 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/storage.dm | 2 +- code/modules/admin/admin.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 2c93193d0ee..42e1a3dc6fc 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -420,7 +420,7 @@ throw_range = 7 w_class = 4.0 origin_tech = "combat=1" - attack_verb = "robusted" + attack_verb = list("robusted") /obj/item/weapon/storage/toolbox/emergency name = "emergency toolbox" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index fc289f39f75..fa592f7b6c5 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -3004,7 +3004,8 @@ var/global/BSACooldown = 0 if(isAI(S)) usr << "AI [key_name(S, usr)]'s laws:" else if(isrobot(S)) - usr << "CYBORG [key_name(S, usr)]'s laws:" + var/mob/living/silicon/robot/R = S + usr << "CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independant)"]: laws:" else if (ispAI(S)) usr << "pAI [key_name(S, usr)]'s laws:" else