cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #379 from Markolie/master

Browse Source 
Bug fixes
This commit is contained in:
ZomgPonies
2015-02-21 15:02:56 -05:00
parent 5df817e031 d2dcb7a041
commit c91558b095
9 changed files with 75 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/ai/ai.dm
+5 -3
View File
@@ -498,9 +498,11 @@ var/list/ai_list = list()
if (href_list["track"])
var/mob/target = locate(href_list["track"]) in mob_list
var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
if(A && target)
A.ai_actual_track(target)
if(target && (!istype(target, /mob/living/carbon/human) || html_decode(href_list["trackname"]) == target:get_face_name()))
ai_actual_track(target)
else
src << "\red System error. Cannot locate [html_decode(href_list["trackname"])]."
return
if (href_list["trackbot"])
code/modules/mob/typing_indicator.dm
+1 -1
View File
@@ -13,7 +13,7 @@ var/global/image/typing_indicator
typing_indicator = image('icons/mob/talk.dmi',null,"typing")
if(client)
if(client.prefs.toggles & SHOW_TYPING)
if((client.prefs.toggles & SHOW_TYPING) || stat != CONSCIOUS)
overlays -= typing_indicator
else
if(state)