From 8104928e7515441ca44e912ac265116f1c8d3cc2 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Fri, 1 Aug 2014 10:36:03 +0200
Subject: [PATCH] Creates a shared proc for applying AI verbs. DRY. Arranges
 some consistency among verbs.

Fixes #5867 as well as a couple other missing verbs.
---
 code/game/machinery/camera/tracking.dm        |  4 ++--
 code/modules/mob/living/silicon/ai/ai.dm      | 21 ++++++++++++++-----
 .../modules/mob/living/silicon/robot/robot.dm |  2 +-
 code/modules/mob/new_player/new_player.dm     |  2 +-
 code/modules/mob/transform_procs.dm           | 12 +----------
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 6ca6257cc2c..a80d687f4d7 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -93,8 +93,8 @@
 
 /mob/living/silicon/ai/proc/ai_remove_location(loc in sorted_stored_locations())
 	set category = "AI Commands"
-	set name = "Remove Camera Location"
-	set desc = "Removes the selected camera location"
+	set name = "Delete Camera Location"
+	set desc = "Deletes the selected camera location"
 
 	if (!(loc in stored_locations))
 		src << "\red Location [loc] not found"
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 0fe0ddc93d6..ff0c13c2fb7 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -53,6 +53,20 @@ var/list/ai_list = list()
 	var/datum/trackable/track = null
 	var/last_announcement = ""
 
+proc/add_ai_verbs(var/mob/M)
+	M.verbs += /mob/living/silicon/ai/proc/ai_call_shuttle
+	M.verbs += /mob/living/silicon/ai/proc/ai_camera_track
+	M.verbs += /mob/living/silicon/ai/proc/ai_camera_list
+	M.verbs += /mob/living/silicon/ai/proc/ai_goto_location
+	M.verbs += /mob/living/silicon/ai/proc/ai_remove_location
+	M.verbs += /mob/living/silicon/ai/proc/ai_hologram_change
+	M.verbs += /mob/living/silicon/ai/proc/ai_network_change
+	M.verbs += /mob/living/silicon/ai/proc/ai_roster
+	M.verbs += /mob/living/silicon/ai/proc/ai_statuschange
+	M.verbs += /mob/living/silicon/ai/proc/ai_store_location
+	M.verbs += /mob/living/silicon/ai/proc/control_integrated_radio
+	M.verbs += /mob/living/silicon/ai/proc/toggle_camera_light
+
 /mob/living/silicon/ai/New(loc, var/datum/ai_laws/L, var/obj/item/device/mmi/B, var/safety = 0)
 	var/list/possibleNames = ai_names
 
@@ -94,10 +108,7 @@ var/list/ai_list = list()
 	aiCamera = new/obj/item/device/camera/siliconcam/ai_camera(src)
 
 	if (istype(loc, /turf))
-		verbs.Add(/mob/living/silicon/ai/proc/ai_call_shuttle,/mob/living/silicon/ai/proc/ai_camera_track, \
-		/mob/living/silicon/ai/proc/ai_camera_list, /mob/living/silicon/ai/proc/ai_network_change, \
-		/mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \
-		/mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/control_integrateed_radio)
+		add_ai_verbs(src)
 
 	//Languages
 	add_language("Sol Common", 0)
@@ -750,7 +761,7 @@ var/list/ai_list = list()
 	else
 		return ..()
 
-/mob/living/silicon/ai/proc/control_integrateed_radio()
+/mob/living/silicon/ai/proc/control_integrated_radio()
 	set name = "Radio Settings"
 	set desc = "Allows you to change settings of your radio."
 	set category = "AI Commands"
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4daa0f5cf8e..26d4dfa6037 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -345,7 +345,7 @@
 // this verb lets cyborgs see the stations manifest
 /mob/living/silicon/robot/verb/cmd_station_manifest()
 	set category = "Robot Commands"
-	set name = "Show Station Manifest"
+	set name = "Show Crew Manifest"
 	show_station_manifest()
 
 
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 0f18e02cf38..3338989ebe3 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -436,7 +436,7 @@
 
 	proc/ViewManifest()
 		var/dat = "<html><body>"
-		dat += "<h4>Crew Manifest</h4>"
+		dat += "<h4>Show Crew Manifest</h4>"
 		dat += data_core.get_manifest(OOC = 1)
 
 		src << browse(dat, "window=manifest;size=370x420;can_close=1")
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 6dbd8ffe0c7..7a6d7140d17 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -120,17 +120,7 @@
 		O.show_laws()
 		O << "<b>These laws may be changed by other players, or by you being the traitor.</b>"
 
-	O.verbs += /mob/living/silicon/ai/proc/ai_call_shuttle
-	O.verbs += /mob/living/silicon/ai/proc/show_laws_verb
-	O.verbs += /mob/living/silicon/ai/proc/ai_camera_track
-	O.verbs += /mob/living/silicon/ai/proc/ai_alerts
-	O.verbs += /mob/living/silicon/ai/proc/ai_camera_list
-	O.verbs += /mob/living/silicon/ai/proc/ai_statuschange
-	O.verbs += /mob/living/silicon/ai/proc/ai_roster
-	O.verbs += /mob/living/silicon/ai/proc/ai_store_location
-	O.verbs += /mob/living/silicon/ai/proc/ai_goto_location
-	O.verbs += /mob/living/silicon/ai/proc/ai_remove_location
-
+	add_ai_verbs(O)
 	O.job = "AI"
 
 	O.rename_self("ai",1)