Merge pull request #1852 from Aranclanos/HurrayMoreShitToMovementCode

Adding bullshit to movement code.
This commit is contained in:
Giacom
2013-11-26 00:34:13 -08:00
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -385,7 +385,8 @@
var/mob/living/carbon/DNA_helper = pulling
H.blood_DNA[DNA_helper.dna.unique_enzymes] = DNA_helper.dna.blood_type
step(pulling, get_dir(pulling.loc, T))
M.start_pulling(t)
if(M)
M.start_pulling(t)
else
if (pulling)
if (istype(pulling, /obj/structure/window))
+2 -1
View File
@@ -438,7 +438,8 @@
var/atom/movable/t = M.pulling
M.stop_pulling()
step(pulling, get_dir(pulling.loc, A))
M.start_pulling(t)
if(M)
M.start_pulling(t)
else
step(pulling, get_dir(pulling.loc, A))
return