diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index cab108a8f33..7c3346947df 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -65,27 +65,31 @@
/obj/proc/updateUsrDialog()
if(in_use)
var/is_in_use = 0
- var/list/nearby = viewers(1, src)
- for(var/mob/M in _using.Copy()) // Only check things actually messing with us.
- if (!M || !M.client || M.machine != src)
- _using.Remove(M)
- continue
+ if(_using.len)
+ var/list/nearby = viewers(1, src)
+ for(var/mob/M in _using.Copy()) // Only check things actually messing with us.
+ if (!M || !M.client || M.machine != src)
+ _using.Remove(M)
+ continue
- if(!M in nearby) // NOT NEARBY
- // AIs/Robots can do shit from afar.
- if (istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/living/silicon/robot))
- is_in_use = 1
- src.attack_ai(M)
+ if(!M in nearby) // NOT NEARBY
+ // AIs/Robots can do shit from afar.
+ if (isAI(M) || isrobot(M))
+ is_in_use = 1
+ src.attack_ai(M)
- // check for TK users
- else if (istype(usr, /mob/living/carbon/human))
- if(istype(usr.l_hand, /obj/item/tk_grab) || istype(usr.r_hand, /obj/item/tk_grab))
- if(usr.client && usr.machine==src)
+ // check for TK users
+ else if (ishuman(M))
+ if(istype(M.l_hand, /obj/item/tk_grab) || istype(M.r_hand, /obj/item/tk_grab))
is_in_use = 1
- src.attack_hand(usr)
- else // EVERYTHING FROM HERE DOWN MUST BE NEARBY
- is_in_use = 1
- attack_hand(usr)
+ src.attack_hand(M)
+ else
+ // Remove.
+ _using.Remove(M)
+ continue
+ else // EVERYTHING FROM HERE DOWN MUST BE NEARBY
+ is_in_use = 1
+ attack_hand(M)
in_use = is_in_use
/obj/proc/updateDialog()
@@ -145,4 +149,4 @@
var/rendered = "[M.name]: [text]"
mo.show_message(rendered, 2)
*/
- return
+ return
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 00946b8678c..1a73187c696 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -83,6 +83,7 @@ FLOOR SAFES
dat += "| [P.name] |
"
dat += ""
user << browse("[name][dat]", "window=safe;size=350x300")
+ onclose(user, "safe")
/obj/structure/safe/Topic(href, href_list)
diff --git a/icons/mob/uniform_fat.dmi b/icons/mob/uniform_fat.dmi
index 01eb838fceb..cd23b412420 100644
Binary files a/icons/mob/uniform_fat.dmi and b/icons/mob/uniform_fat.dmi differ