Merge pull request #9418 from Ghommie/Ghommie-cit216

Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
parent d3d64a7887 e31c441b3d
commit dcb37bfd0e
26 changed files with 356 additions and 152 deletions
@@ -234,7 +234,7 @@

 /datum/component/storage/proc/quick_empty(mob/M)
 	var/atom/A = parent
-	if((!ishuman(M) && (A.loc != M)) || (M.stat != CONSCIOUS) || M.restrained() || !M.canmove)
+	if(!M.canUseStorage() || !A.Adjacent(M) || M.incapacitated())
 		return
 	if(check_locked(null, M, TRUE))
 		return FALSE