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

- Fixed a potential problem where the random teleportation thing that teleporters have a chance of doing would teleport you to a tile that is behind the transition edge.

Browse Source 
- Fixed issue 470. You can now teleport while using the chameleon projector.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4466 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-08-17 07:05:03 +00:00
parent 3a511d5462
commit f0f803407a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@
//must succeed in most cases //must succeed in most cases
proc/setTeleatom(atom/movable/ateleatom) proc/setTeleatom(atom/movable/ateleatom)
if(istype(ateleatom, /obj/effect)) if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon))
del(ateleatom) del(ateleatom)
return 0 return 0
if(istype(ateleatom)) if(istype(ateleatom))

2
code/game/machinery/teleporter.dm
View File

@@ -133,7 +133,7 @@
return return
if (istype(M, /atom/movable)) if (istype(M, /atom/movable))
if(prob(5) && !accurate) //oh dear a problem, put em in deep space if(prob(5) && !accurate) //oh dear a problem, put em in deep space
do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy - 5), 3), 2) do_teleport(M, locate(rand((2*TRANSITIONEDGE), world.maxx - (2*TRANSITIONEDGE)), rand((2*TRANSITIONEDGE), world.maxy - (2*TRANSITIONEDGE)), 3), 2)
else else
do_teleport(M, com.locked) //dead-on precision do_teleport(M, com.locked) //dead-on precision
else else