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 << "<b>AI [key_name(S, usr)]'s laws:</b>"
 		else if(isrobot(S))
-			usr << "<b>CYBORG [key_name(S, usr)]'s laws:</b>"
+			var/mob/living/silicon/robot/R = S
+			usr << "<b>CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independant)"]: laws:</b>"
 		else if (ispAI(S))
 			usr << "<b>pAI [key_name(S, usr)]'s laws:</b>"
 		else