Merge pull request #10962 from Core0verload/weneedtogodeeper

Removes some annoying inventory tetris with storages in storages
This commit is contained in:
Remie Richards
2015-08-03 17:15:11 +01:00
3 changed files with 13 additions and 12 deletions
+2 -1
View File
@@ -570,7 +570,8 @@ Sorry Giacom. Please don't be mad :(
else
stop_pulling()
. = ..()
if ((s_active && !( s_active in contents ) ))
if (s_active && !(s_active in contents) && !(s_active.loc in contents))
// It's ugly. But everything related to inventory/storage is. -- c0
s_active.close(src)
for(var/mob/living/simple_animal/slime/M in oview(1,src))