Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/chemical/Chemistry-Tools.dm

@@ -172,7 +172,8 @@
 
 
 	afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
-		if (istype(target, /obj/item/weapon/storage || istype(target, /obj/item/weapon/gun/grenadelauncher) || istype(target, /obj/structure/table))) return ..()
+		if (istype(target, /obj/item/weapon/storage) || istype(target, /obj/item/clothing/suit/storage) || istype(target, /obj/item/weapon/gun/grenadelauncher) || istype(target, /obj/structure/table))
+			return ..()
 		if (!src.state && stage == 2 && !crit_fail)
 			user << "\red You prime the grenade! 3 seconds!"
 			message_admins("[key_name_admin(user)] used a chemistry grenade ([src.name]).")

code/modules/recycling/disposal.dm

@@ -502,7 +502,6 @@
 
 		// now everything inside the disposal gets put into the holder
 		// note AM since can contain mobs or objs
-		var/tagOverride = 0
 		for(var/atom/movable/AM in D)
 			AM.loc = src
 			/*if(istype(AM, /mob/living/carbon/human))
@@ -519,10 +518,8 @@
 			else if (!src.destinationTag)
 				src.destinationTag = null
 			else if (istype(AM, /mob))	//If there is a mob somewhere in there....
-				tagOverride = 1
-		if(tagOverride)
-			if(prob(25))
-				src.destinationTag = null	//Then 50% chance of going to the mail room!
+				if(prob(10))
+					src.destinationTag = "Mail Office"
 
 
 	// start the movement process
@@ -554,7 +551,7 @@
 			//
 			if(!(count--))
 				tomail = 1 //So loops end up in the mail room.
-				destinationTag = null
+				destinationTag = "Mail Office"
 		return
 
 
@@ -1002,6 +999,8 @@
 			for(var/i, i <= backType.len, i++)
 				if(sortTag == src.backType[i])
 					return negdir
+		else if (!sortTag && mailsort)
+			return sortdir
 		else if (!sortTag && !mailsort)
 			return posdir
 
@@ -1012,7 +1011,7 @@
 				if(sortTag == src.sortType[i])
 					issort = 1
 
-			if(issort || ((!sortTag || ismail) && mailsort)) //if destination matches filtered type...
+			if(issort) //if destination matches filtered type...
 				return sortdir		// exit through sortdirection
 			else
 				return posdir