Change various PAI abilities from proc to verb, init their verbs on creation

This commit is contained in:
AlaunusLux
2024-01-14 06:23:41 -06:00
parent abc6b34a89
commit a4413dc346
6 changed files with 14 additions and 17 deletions
+1
View File
@@ -101,6 +101,7 @@ SUBSYSTEM_DEF(pai)
if(pai.mind)
update_antag_icons(pai.mind)
pai.mind.current.client.init_verbs()
pai_candidates -= candidate
usr << browse(null, "window=findPai")
+4 -4
View File
@@ -15,13 +15,13 @@
/mob/living/silicon/ai
silicon_subsystems = list(
/mob/living/silicon/proc/silicon_mimic_accent
/mob/living/silicon/verb/silicon_mimic_accent
)
/mob/living/silicon/robot/combat
register_alarms = 0
silicon_subsystems = list(
/mob/living/silicon/proc/silicon_mimic_accent
/mob/living/silicon/verb/silicon_mimic_accent
)
/mob/living/silicon/proc/init_subsystems()
@@ -38,13 +38,13 @@
/****************
* Computer *
*****************/
/mob/living/silicon/proc/computer_interact()
/mob/living/silicon/verb/computer_interact()
set name = "Open Computer Interface"
set category = "Subsystems"
computer.attack_self(src)
/mob/living/silicon/pai/proc/personal_computer_interact()
/mob/living/silicon/pai/verb/personal_computer_interact()
set name = "Access Local Computer"
set category = "Subsystems"
@@ -25,6 +25,8 @@
var/mob/living/silicon/pai/pai = new(card)
pai.key = pai_key
card.setPersonality(pai)
if(pai.mind)
pai.mind.current.client.init_verbs()
if(name)
pai.SetName(name)
+4 -10
View File
@@ -183,12 +183,6 @@
add_language(LANGUAGE_SIGN, 0)
set_custom_sprite()
add_verb(src, /mob/living/silicon/pai/proc/choose_chassis)
add_verb(src, /mob/living/silicon/pai/proc/choose_verbs)
add_verb(src, /mob/living/silicon/proc/computer_interact)
add_verb(src, /mob/living/silicon/pai/proc/personal_computer_interact)
add_verb(src, /mob/living/silicon/proc/silicon_mimic_accent)
. = ..()
@@ -366,7 +360,7 @@
close_up()
/mob/living/silicon/pai/proc/choose_chassis()
/mob/living/silicon/pai/verb/choose_chassis()
set category = "pAI Commands"
set name = "Choose Chassis"
@@ -381,7 +375,7 @@
holder_type = pai_holder_types[choice]
chassis = icon_state
remove_verb(src, /mob/living/silicon/pai/proc/choose_chassis)
remove_verb(src, /mob/living/silicon/pai/verb/choose_chassis)
add_verb(src, /mob/living/proc/hide)
/mob/living/silicon/pai/verb/get_onmob_location()
@@ -395,7 +389,7 @@
card.report_onmob_location(0, card.get_equip_slot(), src)
/mob/living/silicon/pai/proc/choose_verbs()
/mob/living/silicon/pai/verb/choose_verbs()
set category = "pAI Commands"
set name = "Choose Speech Verbs"
@@ -407,7 +401,7 @@
speak_exclamation = sayverbs[(sayverbs.len>1 ? 2 : sayverbs.len)]
speak_query = sayverbs[(sayverbs.len>2 ? 3 : sayverbs.len)]
remove_verb(src, /mob/living/silicon/pai/proc/choose_verbs)
remove_verb(src, /mob/living/silicon/pai/verb/choose_verbs)
/mob/living/silicon/pai/lay_down()
set name = "Rest"
+2 -2
View File
@@ -33,8 +33,8 @@
// Internal Computer
var/obj/item/modular_computer/silicon/computer
var/list/silicon_subsystems = list(
/mob/living/silicon/proc/computer_interact,
/mob/living/silicon/proc/silicon_mimic_accent
/mob/living/silicon/verb/computer_interact,
/mob/living/silicon/verb/silicon_mimic_accent
)
// Utility
@@ -1,4 +1,4 @@
/mob/living/silicon/proc/silicon_mimic_accent()
/mob/living/silicon/verb/silicon_mimic_accent()
set name = "Mimic Accent"
set category = "Subsystems"