Merge pull request #4020 from caelaislinn/bugfix

Various bugfixes

code/modules/mob/living/carbon/human/human.dm

@@ -68,12 +68,22 @@
 		//BubbleWrap: people in handcuffs are always switched around as if they were on 'help' intent to prevent a person being pulled from being seperated from their puller
 		if((tmob.a_intent == "help" || tmob.restrained()) && (a_intent == "help" || src.restrained()) && tmob.canmove && canmove) // mutual brohugs all around!
 			var/turf/oldloc = loc
+			var/turf/other_loc = tmob.loc
+
 			loc = tmob.loc
 			tmob.loc = oldloc
 			now_pushing = 0
+
 			for(var/mob/living/carbon/slime/slime in view(1,tmob))
 				if(slime.Victim == tmob)
 					slime.UpdateFeed()
+
+			//cross any movable atoms on either turf
+			for(var/atom/movable/M in other_loc)
+				M.Crossed(src)
+			for(var/atom/movable/M in oldloc)
+				M.Crossed(tmob)
+
 			return
 
 		if(tmob.r_hand && istype(tmob.r_hand, /obj/item/weapon/shield/riot))

code/modules/recycling/disposal.dm

@@ -777,6 +777,12 @@
 	// pipe affected by explosion
 	ex_act(severity)
 
+		//pass on ex_act to our contents before calling it on ourself
+		var/obj/structure/disposalholder/H = locate() in src
+		if(H)
+			for(var/atom/movable/AM in H)
+				AM.ex_act(severity)
+
 		switch(severity)
 			if(1.0)
 				broken(0)