shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Stops AIs from taking actions while depowered (#2813)

Browse Source 
* Stops AIs from taking actions while depowered

* Update ai.dm
This commit is contained in:
CitadelStationBot
2017-09-18 01:45:59 -05:00
committed by Poojawa
parent 4bc6e9d522
commit d8a1fc936e
6 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/ai.dm
+3 -2
View File
@@ -14,7 +14,8 @@
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
return
if(control_disabled || stat) return
if(control_disabled || incapacitated())
return
if(ismob(A))
ai_actual_track(A)
@@ -31,7 +32,7 @@
if(call(client.click_intercept, "InterceptClickOn")(src, params, A))
return
if(control_disabled || stat)
if(control_disabled || incapacitated())
return
var/turf/pixel_turf = get_turf_pixel(A)
code/_onclick/hud/ai.dm
+8 -2
View File
@@ -2,8 +2,8 @@
icon = 'icons/mob/screen_ai.dmi'
/obj/screen/ai/Click()
if(isobserver(usr))
return 1
if(isobserver(usr) || usr.incapacitated())
return TRUE
/obj/screen/ai/aicore
name = "AI core"
@@ -20,6 +20,8 @@
icon_state = "camera"
/obj/screen/ai/camera_list/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
var/camera = input(AI, "Choose which camera you want to view", "Cameras") as null|anything in AI.get_camera_list()
AI.ai_camera_list(camera)
@@ -130,6 +132,8 @@
icon_state = "take_picture"
/obj/screen/ai/image_take/Click()
if(..())
return
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.aicamera.toggle_camera_mode()
@@ -142,6 +146,8 @@
icon_state = "view_images"
/obj/screen/ai/image_view/Click()
if(..())
return
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.aicamera.viewpictures()
code/game/objects/items/devices/PDA/PDA.dm
+6 -5
View File
@@ -856,9 +856,6 @@ GLOBAL_LIST_EMPTY(PDAs)
var/list/plist = list()
var/list/namecounts = list()
if(user.stat == DEAD)
return //won't work if dead
if(src.aiPDA.toff)
to_chat(user, "Turn on your receiver in order to send messages.")
return
@@ -883,6 +880,10 @@ GLOBAL_LIST_EMPTY(PDAs)
if(add_photo=="Yes")
var/datum/picture/Pic = aicamera.selectpicture(aicamera)
src.aiPDA.photo = Pic.fields["img"]
if(incapacitated())
return
src.aiPDA.create_message(src, selected)
@@ -910,8 +911,8 @@ GLOBAL_LIST_EMPTY(PDAs)
to_chat(usr, "You do not have a PDA. You should make an issue report about this.")
/mob/living/silicon/ai/proc/cmd_show_message_log(mob/user)
if(user.stat == DEAD)
return //won't work if dead
if(incapacitated())
return
if(!isnull(aiPDA))
var/HTML = "<html><head><title>AI PDA Message Log</title></head><body>[aiPDA.tnote]</body></html>"
user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
code/modules/mob/living/silicon/ai/ai.dm
+48 -56
View File
@@ -169,7 +169,7 @@
/mob/living/silicon/ai/verb/pick_icon()
set category = "AI Commands"
set name = "Set AI Core Display"
if(stat || aiRestorePowerRoutine)
if(incapacitated())
return
//if(icon_state == initial(icon_state))
@@ -308,16 +308,15 @@
onclose(src, "airoster")
/mob/living/silicon/ai/proc/ai_call_shuttle()
if(stat == DEAD)
return //won't work if dead
if(isAI(usr))
var/mob/living/silicon/ai/AI = src
if(AI.control_disabled)
to_chat(usr, "Wireless control is disabled!")
return
if(control_disabled)
to_chat(usr, "<span class='warning'>Wireless control is disabled!</span>")
return
var/reason = input(src, "What is the nature of your emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call") as null|text
if(incapacitated())
return
if(trim(reason))
SSshuttle.requestEvac(src, reason)
@@ -335,8 +334,8 @@
set name = "Toggle Floor Bolts"
if(!isturf(loc)) // if their location isn't a turf
return // stop
if(stat == DEAD)
return //won't work if dead
if(incapacitated())
return
anchored = !anchored // Toggles the anchor
to_chat(src, "<b>You are now [anchored ? "" : "un"]anchored.</b>")
@@ -347,21 +346,16 @@
/mob/living/silicon/ai/proc/ai_cancel_call()
set category = "Malfunction"
if(stat == DEAD)
return //won't work if dead
if(isAI(usr))
var/mob/living/silicon/ai/AI = src
if(AI.control_disabled)
to_chat(src, "Wireless control is disabled!")
return
if(control_disabled)
to_chat(src, "<span class='warning'>Wireless control is disabled!</span>")
return
SSshuttle.cancelEvac(src)
return
/mob/living/silicon/ai/restrained(ignore_grab)
. = 0
/mob/living/silicon/ai/Topic(href, href_list)
if(usr != src)
if(usr != src || incapacitated())
return
..()
if (href_list["mach_close"])
@@ -385,11 +379,10 @@
//Carn: holopad requests
if(href_list["jumptoholopad"])
var/obj/machinery/holopad/H = locate(href_list["jumptoholopad"])
if(stat == CONSCIOUS)
if(H)
H.attack_ai(src) //may as well recycle
else
to_chat(src, "<span class='notice'>Unable to locate the holopad.</span>")
if(H)
H.attack_ai(src) //may as well recycle
else
to_chat(src, "<span class='notice'>Unable to locate the holopad.</span>")
if(href_list["track"])
var/string = href_list["track"]
trackable_mobs()
@@ -434,9 +427,6 @@
if(!GLOB.cameranet.checkCameraVis(M))
to_chat(src, "<span class='warning'>Exosuit is no longer near active cameras.</span>")
return
if(lacks_power())
to_chat(src, "<span class='warning'>You're depowered!</span>")
return
if(!isturf(loc))
to_chat(src, "<span class='warning'>You aren't in your core!</span>")
return
@@ -449,8 +439,8 @@
if(!tracking)
cameraFollow = null
if (!C || stat == DEAD) //C.can_use())
return 0
if (!C)
return FALSE
if(!src.eyeobj)
view_core()
@@ -459,17 +449,17 @@
eyeobj.setLoc(get_turf(C))
//machine = src
return 1
return TRUE
/mob/living/silicon/ai/proc/botcall()
set category = "AI Commands"
set name = "Access Robot Control"
set desc = "Wirelessly control various automatic robots."
if(stat == DEAD)
return //won't work if dead
if(incapacitated())
return
if(control_disabled)
to_chat(src, "Wireless communication is disabled.")
to_chat(src, "<span class='warning'>Wireless control is disabled.</span>")
return
var/turf/ai_current_turf = get_turf(src)
var/ai_Zlevel = ai_current_turf.z
@@ -522,8 +512,6 @@
/mob/living/silicon/ai/triggerAlarm(class, area/A, O, obj/alarmsource)
if(alarmsource.z != z)
return
if (stat == 2)
return 1
var/list/L = alarms[class]
for (var/I in L)
if (I == A.name)
@@ -585,8 +573,8 @@
cameraFollow = null
var/cameralist[0]
if(stat == DEAD)
return //won't work if dead
if(incapacitated())
return
var/mob/living/silicon/ai/U = usr
@@ -629,8 +617,8 @@
set category = "AI Commands"
set name = "AI Status"
if(stat == DEAD)
return //won't work if dead
if(incapacitated())
return
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer", "Dorfy", "Blue Glow", "Red Glow")
var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
for (var/M in GLOB.ai_status_displays) //change status of displays
@@ -652,8 +640,8 @@
set desc = "Change the default hologram available to AI to something else."
set category = "AI Commands"
if(stat == DEAD)
return //won't work if dead
if(incapacitated())
return
var/input
switch(alert("Would you like to select a hologram based on a crew member, an animal, or switch to a unique avatar?",,"Crew Member","Unique","Animal"))
if("Crew Member")
@@ -729,9 +717,6 @@
apc.malfvacate()
/mob/living/silicon/ai/proc/toggle_camera_light()
if(stat != CONSCIOUS)
return
camera_light_on = !camera_light_on
if (!camera_light_on)
@@ -774,8 +759,8 @@
set desc = "Allows you to change settings of your radio."
set category = "AI Commands"
if(stat == DEAD)
return //won't work if dead
if(incapacitated())
return
to_chat(src, "Accessing Subspace Transceiver control...")
if (radio)
@@ -790,8 +775,8 @@
set desc = "Modify the default radio setting for your automatic announcements."
set category = "AI Commands"
if(stat == DEAD)
return //won't work if dead
if(incapacitated())
return
set_autosay()
/mob/living/silicon/ai/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
@@ -818,17 +803,22 @@
/mob/living/silicon/ai/can_buckle()
return 0
/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close = 0)
if(stat)
return
/mob/living/silicon/ai/incapacitated()
if(aiRestorePowerRoutine)
return TRUE
return ..()
/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close = FALSE)
if(control_disabled || incapacitated())
return FALSE
if(be_close && !in_range(M, src))
return
return FALSE
//stop AIs from leaving windows open and using then after they lose vision
//apc_override is needed here because AIs use their own APC when powerless
//get_turf_pixel() is because APCs in maint aren't actually in view of the inner camera
if(M && GLOB.cameranet && !GLOB.cameranet.checkTurfVis(get_turf_pixel(M)) && !apc_override)
return
return 1
return FALSE
return TRUE
/mob/living/silicon/ai/proc/relay_speech(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
raw_message = lang_treat(speaker, message_language, raw_message, spans, message_mode)
@@ -931,8 +921,10 @@
set category = "AI Commands"
set name = "Deploy to Shell"
if(stat || lacks_power() || control_disabled)
to_chat(src, "<span class='danger'>Wireless networking module is offline.</span>")
if(incapacitated())
return
if(control_disabled)
to_chat(src, "<span class='warning'>Wireless networking module is offline.</span>")
return
var/list/possible = list()
code/modules/mob/living/silicon/ai/freelook/eye.dm
+2 -2
View File
@@ -106,8 +106,8 @@
set category = "AI Commands"
set name = "Toggle Camera Acceleration"
if(usr.stat == DEAD)
return //won't work if dead
if(incapacitated())
return
acceleration = !acceleration
to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].")
code/modules/mob/living/silicon/ai/say.dm
+8 -6
View File
@@ -18,9 +18,11 @@
return !config.silent_ai
/mob/living/silicon/ai/radio(message, message_mode, list/spans, language)
if(!radio_enabled || aiRestorePowerRoutine || stat) //AI cannot speak if radio is disabled (via intellicard) or depowered.
if(incapacitated())
return FALSE
if(!radio_enabled) //AI cannot speak if radio is disabled (via intellicard) or depowered.
to_chat(src, "<span class='danger'>Your radio transmitter is offline!</span>")
return 0
return FALSE
..()
/mob/living/silicon/ai/get_message_mode(message)
@@ -71,8 +73,8 @@
set desc = "Display a list of vocal words to announce to the crew."
set category = "AI Commands"
if(usr.stat == DEAD)
return //won't work if dead
if(incapacitated())
return
var/dat = "Here is a list of words you can type into the 'Announcement' button to create sentences to vocally announce to everyone on the same level at you.<BR> \
<UL><LI>You can also click on the word to preview it.</LI>\
@@ -105,11 +107,11 @@
if(!message || announcing_vox > world.time)
return
if(stat != CONSCIOUS)
if(incapacitated())
return
if(control_disabled)
to_chat(src, "<span class='notice'>Wireless interface disabled, unable to interact with announcement PA.</span>")
to_chat(src, "<span class='warning'>Wireless interface disabled, unable to interact with announcement PA.</span>")
return
var/list/words = splittext(trim(message), " ")