cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1188 from sick-trigger/master

Browse Source 
Fixes teleporting with an active chamelion projector
This commit is contained in:
Mloc
2012-05-29 06:46:04 -07:00
parent f1f0095385 83e37be057
commit 7da503e2c5
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/helper_datums/teleport.dm
+1 -1
View File
@@ -52,7 +52,7 @@
//must succeed in most cases
proc/setTeleatom(atom/movable/ateleatom)
if(istype(ateleatom, /obj/effect))
if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon))
del(ateleatom)
return 0
if(istype(ateleatom))