Merge remote-tracking branch 'citadel/master' into auxtools-atmos

2021-04-27 00:59:45 -07:00
parent a3b1e44f32 810eba15ed
commit 47489c21d6
679 changed files with 317691 additions and 310960 deletions
@@ -141,7 +141,7 @@

 /obj/item/clothing/head/mob_holder/dropped(mob/user)
 	. = ..()
-	if(held_mob && !ismob(loc))//don't release on soft-drops
+	if(held_mob && !ismob(loc) && !istype(loc,/obj/item/storage))//don't release on soft-drops
 		release()

 /obj/item/clothing/head/mob_holder/proc/release()