From c4ba455f3571d616bc843aca3831c8380f5d6f3b Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 4 Aug 2012 13:12:17 +1000 Subject: [PATCH] added var to /mob to allow some mobs to share spaces Signed-off-by: Cael_Aislinn --- code/modules/mob/living/carbon/human/human.dm | 7 ++++--- code/modules/mob/mob_defines.dm | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index e9eef75bc6e..5d2a1b26fa5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/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) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 4417cdb9116..5b55ecfe231 100644 --- a/code/modules/mob/mob_defines.dm +++ b/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) +