Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

This commit is contained in:
Aurorablade
2016-08-24 20:49:20 -04:00
53 changed files with 604 additions and 142 deletions
@@ -65,7 +65,10 @@
/obj/structure/closet/proc/moveMob(var/mob/M, var/atom/destination)
loc.Exited(M)
M.loc = destination
loc.Entered(M, ignoreRest = 1)
if(isturf(loc))
loc.Entered(M, src, ignoreRest = 1)
else
loc.Entered(M, src)
for(var/atom/movable/AM in loc)
if(istype(AM, /obj/item))
continue