cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair

Browse Source 
Converts some loc = to forceMove()
This commit is contained in:
mwerezak
2015-09-14 12:11:09 -04:00
parent a3606f7a08 bb5680193f
commit db95743784
10 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
View File

@@ -75,7 +75,7 @@
set_dir(direction)
if(pulling) // Driver
if(pulling.loc == src.loc) // We moved onto the wheelchair? Revert!
pulling.loc = T
pulling.forceMove(T)
else
spawn(0)
if(get_dist(src, pulling) > 1) // We are too far away? Losing control.
@@ -107,7 +107,7 @@
pulling = null
else
if (occupant && (src.loc != occupant.loc))
src.loc = occupant.loc // Failsafe to make sure the wheelchair stays beneath the occupant after driving
src.forceMove(occupant.loc) // Failsafe to make sure the wheelchair stays beneath the occupant after driving
/obj/structure/bed/chair/wheelchair/attack_hand(mob/living/user as mob)
if (pulling)