added var to /mob to allow some mobs to share spaces

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

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

@@ -220,9 +220,10 @@
 
 		//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
-			loc = tmob.loc
-			tmob.loc = oldloc
+			if(tmob.swap_on_mobbump)
+				var/turf/oldloc = loc
+				loc = tmob.loc
+				tmob.loc = oldloc
 			now_pushing = 0
 			for(var/mob/living/carbon/metroid/Metroid in view(1,tmob))
 				if(Metroid.Victim == tmob)

code/modules/mob/mob_defines.dm

@@ -294,3 +294,5 @@ the mob is also allowed to move without any sort of restriction. For instance, i
 	var/list/radar_blips = list() // list of screen objects, radar blips
 	var/radar_open = 0 	// nonzero is radar is open
 
+	var/swap_on_mobbump = 1	//by default, mob collisions will swap the two mobs (if allowed)
+