cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes teleporting while buckled

Browse Source
This commit is contained in:
Hubblenaut
2014-07-02 22:35:11 +02:00
parent c0ae74b813
commit abef4bf943
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/datums/helper_datums/teleport.dm
View File

@@ -108,12 +108,19 @@
playSpecials(curturf,effectin,soundin) playSpecials(curturf,effectin,soundin)
var/obj/structure/stool/bed/chair/C = null
if(isliving(teleatom))
var/mob/living/L = teleatom
if(L.buckled)
C = L.buckled
if(force_teleport) if(force_teleport)
teleatom.forceMove(destturf) teleatom.forceMove(destturf)
playSpecials(destturf,effectout,soundout) playSpecials(destturf,effectout,soundout)
else else
if(teleatom.Move(destturf)) if(teleatom.Move(destturf))
playSpecials(destturf,effectout,soundout) playSpecials(destturf,effectout,soundout)
if(C)
C.forceMove(destturf)
destarea.Entered(teleatom) destarea.Entered(teleatom)