Merge branch 'master' into upstream-merge-37476
This commit is contained in:
+2
-15
@@ -506,22 +506,9 @@
|
||||
return
|
||||
show_inv(usr)
|
||||
|
||||
/mob/proc/is_active()
|
||||
return (0 >= usr.stat)
|
||||
|
||||
/mob/proc/is_muzzled()
|
||||
return 0
|
||||
|
||||
/mob/proc/see(message)
|
||||
if(!is_active())
|
||||
return 0
|
||||
to_chat(src, message)
|
||||
return 1
|
||||
|
||||
/mob/proc/show_viewers(message)
|
||||
for(var/mob/M in viewers())
|
||||
M.see(message)
|
||||
|
||||
/mob/Stat()
|
||||
..()
|
||||
|
||||
@@ -838,8 +825,8 @@
|
||||
break
|
||||
search_id = 0
|
||||
|
||||
else if( search_pda && istype(A, /obj/item/device/pda) )
|
||||
var/obj/item/device/pda/PDA = A
|
||||
else if( search_pda && istype(A, /obj/item/pda) )
|
||||
var/obj/item/pda/PDA = A
|
||||
if(PDA.owner == oldname)
|
||||
PDA.owner = newname
|
||||
PDA.update_label()
|
||||
|
||||
Reference in New Issue
Block a user