Merge pull request #3468 from CHOMPStation2/upstream-merge-11866

[MIRROR] Fixes AI open door command
This commit is contained in:
Nadyr
2021-12-12 05:59:49 -05:00
committed by GitHub
+8 -8
View File
@@ -85,7 +85,7 @@ var/list/ai_verbs_default = list(
var/datum/ai_icon/selected_sprite // The selected icon set
var/custom_sprite = 0 // Whether the selected icon is custom
var/carded
// Multicam Vars
var/multicam_allowed = TRUE
var/multicam_on = FALSE
@@ -475,7 +475,7 @@ var/list/ai_verbs_default = list(
else
to_chat(src, "<font color='red'>System error. Cannot locate [html_decode(href_list["trackname"])].</font>")
return
if(href_list["trackbot"])
var/mob/living/bot/target = locate(href_list["trackbot"]) in mob_list
if(target)
@@ -808,21 +808,21 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/proc/check_unable(var/flags = 0, var/feedback = 1)
if(stat == DEAD)
if(feedback)
if(feedback)
to_chat(src, "<span class='warning'>You are dead!</span>")
return 1
if(aiRestorePowerRoutine)
if(feedback)
if(feedback)
to_chat(src, "<span class='warning'>You lack power!</span>")
return 1
if((flags & AI_CHECK_WIRELESS) && src.control_disabled)
if(feedback)
if(feedback)
to_chat(src, "<span class='warning'>Wireless control is disabled!</span>")
return 1
if((flags & AI_CHECK_RADIO) && src.aiRadio.disabledAi)
if(feedback)
if(feedback)
to_chat(src, "<span class='warning'>System Error - Transceiver Disabled!</span>")
return 1
return 0
@@ -854,7 +854,7 @@ var/list/ai_verbs_default = list(
if(istype(A))
switch(tgui_alert(src, "Do you want to open \the [A] for [target]?", "Doorknob_v2a.exe", list("Yes", "No")))
if("Yes")
A.AIShiftClick()
A.AIShiftClick(src)
to_chat(src, "<span class='notice'>You open \the [A] for [target].</span>")
else
to_chat(src, "<span class='warning'>You deny the request.</span>")
@@ -966,7 +966,7 @@ var/list/ai_verbs_default = list(
//This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only.
var/rendered = "<i><span class='game say'>Relayed Speech: <span class='name'>[name_used]</span> [message]</span></i>"
show_message(rendered, 2)
/mob/living/silicon/ai/proc/toggle_multicam_verb()
set name = "Toggle Multicam"
set category = "AI Commands"