Creates a shared proc for applying AI verbs. DRY. Arranges some consistency among verbs.

Fixes #5867 as well as a couple other missing verbs.
This commit is contained in:
PsiOmega
2014-08-01 10:36:44 +02:00
parent b17e5fc5bf
commit 8104928e75
5 changed files with 21 additions and 20 deletions
+16 -5
View File
@@ -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"
@@ -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()
+1 -1
View File
@@ -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")
+1 -11
View File
@@ -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)