Fixes #2564 and Fixes #2621, observers without a mind that is linked to a current body should now be chosen for special roles if they have them enabled. Fixes #1627, diona and monkeys can now open backpacks the same way humans do.

This commit is contained in:
clusterfack
2015-01-29 20:40:31 -06:00
parent 95acf2f308
commit d8fa66d77c
2 changed files with 5 additions and 2 deletions

View File

@@ -376,7 +376,7 @@ var/list/DummyCache = list()
while(candidates.len <= 0 && i < 5)
roleselect_debug("get_active_candidates(role_id=[role_id], buffer=[buffer], poll=[poll]): Player list is [player_list.len] items long.")
for(var/mob/dead/observer/G in player_list)
if(!G.mind || (G.mind.current && G.mind.current.stat != DEAD))
if(G.mind && G.mind.current && G.mind.current.stat != DEAD)
roleselect_debug("get_active_candidates(role_id=[role_id], buffer=[buffer], poll=[poll]): Skipping [G] - Shitty candidate.")
continue

View File

@@ -335,7 +335,7 @@
else
user << "<span class='notice'> You're a robot. No.</span>"
return //Robots can't interact with storage items.
if(!can_be_inserted(W))
return
@@ -395,6 +395,9 @@
src.add_fingerprint(user)
return
/obj/item/weapon/storage/attack_paw(mob/user as mob)
return attack_hand(user)
/obj/item/weapon/storage/verb/toggle_gathering_mode()
set name = "Switch Gathering Method"
set category = "Object"