Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor

Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
This commit is contained in:
MrPerson
2014-06-09 01:50:44 -07:00
333 changed files with 7786 additions and 17320 deletions

View File

@@ -189,7 +189,9 @@ LINEN BINS
user << "<span class='notice'>You put [I] in [src].</span>"
update_icon()
else if(amount && !hidden && I.w_class < 4) //make sure there's sheets to hide it among, make sure nothing else is hidden in there.
user.drop_item()
if(!user.drop_item())
user << "<span class='notice'>\The [I] is stuck to your hand, you cannot hide it among the sheets!</span>"
return
I.loc = src
hidden = I
user << "<span class='notice'>You hide [I] among the sheets.</span>"