cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 09:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4020 from caelaislinn/bugfix

Browse Source 
Various bugfixes
This commit is contained in:
Alex
2014-07-26 17:59:07 +01:00
parent 128cb7d9c7 891e5e58a5
commit 45c33db77d
8 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+10
View File
@@ -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))