cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-21 11:06:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3506 from VOREStation/aro-portallocal

Browse Source 
Fix cascade portal teleporting
This commit is contained in:
Aronai Sieyes
2018-04-19 20:30:34 -04:00
committed by GitHub
parent 7ead58510c 86a0536705
commit fa8f21673c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/endgame/supermatter_cascade/portal.dm
+3 -3
View File
@@ -38,13 +38,13 @@
var/mob/living/L = A
if(L.buckled && istype(L.buckled,/obj/structure/bed/))
var/turf/O = L.buckled
do_teleport(O, pick(endgame_safespawns))
do_teleport(O, pick(endgame_safespawns), local = FALSE) //VOREStation Edit
L.loc = O.loc
else
do_teleport(L, pick(endgame_safespawns)) //dead-on precision
do_teleport(L, pick(endgame_safespawns), local = FALSE) //dead-on precision //VOREStation Edit
else if (istype(A, /obj/mecha/))
do_teleport(A, pick(endgame_safespawns)) //dead-on precision
do_teleport(A, pick(endgame_safespawns), local = FALSE) //dead-on precision //VOREStation Edit
else if (isturf(A))
var/turf/T = A