Merge pull request #2781 from Angelite191/minorfixes

Minor bug fixes
This commit is contained in:
d3athrow
2015-02-14 11:04:53 -06:00
4 changed files with 22 additions and 2 deletions

View File

@@ -84,7 +84,7 @@
/obj/structure/bookcase/attack_hand(var/mob/user as mob)
if(contents.len)
var/obj/item/weapon/book/choice = input("Which book would you like to remove from the shelf?") in contents as obj|null
var/obj/item/weapon/book/choice = input("Which book would you like to remove from the shelf?") as null|obj in contents
if(choice)
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
return
@@ -322,4 +322,4 @@
user << "<font color=green>Computer has been associated with this unit.</font>"
else
user << "<font color=red>No associated computer found. Only local scans will function properly.</font>"
user << "\n"
user << "\n"