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

Merge pull request #3259 from VOREStation/vplk-fix-step-teleporters

Browse Source 
Fix step_trigger teleporters to use forceMove()
This commit is contained in:
Anewbe
2017-04-10 12:15:48 -05:00
committed by GitHub
parent fb9469a8df 249b5a904b
commit 43f6f48abb
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/objects/effects/step_triggers.dm
View File

@@ -95,10 +95,8 @@
Trigger(var/atom/movable/A) Trigger(var/atom/movable/A)
if(teleport_x && teleport_y && teleport_z) if(teleport_x && teleport_y && teleport_z)
var/turf/T = locate(teleport_x, teleport_y, teleport_z)
A.x = teleport_x A.forceMove(T)
A.y = teleport_y
A.z = teleport_z
/* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */ /* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */
@@ -110,8 +108,5 @@
Trigger(var/atom/movable/A) Trigger(var/atom/movable/A)
if(teleport_x && teleport_y && teleport_z) if(teleport_x && teleport_y && teleport_z)
if(teleport_x_offset && teleport_y_offset && teleport_z_offset) if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
var/turf/T = locate(rand(teleport_x, teleport_x_offset), rand(teleport_y, teleport_y_offset), rand(teleport_z, teleport_z_offset))
A.x = rand(teleport_x, teleport_x_offset) A.forceMove(T)
A.y = rand(teleport_y, teleport_y_offset)
A.z = rand(teleport_z, teleport_z_offset)