cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 00:27:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes portals moving anchored atoms (#22587)

Browse Source 
* Fixes portals moving anchored objects

* Missing a letter

* Mecha
This commit is contained in:
KorPhaeron
2017-01-02 09:07:11 -05:00
committed by AnturK
parent 5628bbe0a4
commit 010f305ee2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/wormholes.dm
+1 -1
View File
@@ -60,7 +60,7 @@
/obj/effect/portal/wormhole/teleport(atom/movable/M)
if(istype(M, /obj/effect)) //sparks don't teleport
return
if(M.anchored && istype(M, /obj/mecha))
if(M.anchored && !istype(M, /obj/mecha))
return
if(istype(M, /atom/movable))
code/modules/mining/equipment.dm
+1 -1
View File
@@ -143,7 +143,7 @@
desc = "A stable hole in the universe made by a wormhole jaunter. Turbulent doesn't even begin to describe how rough passage through one of these is, but at least it will always get you somewhere near a beacon."
/obj/effect/portal/wormhole/jaunt_tunnel/teleport(atom/movable/M)
if(istype(M, /obj/effect))
if(M.anchored || istype(M, /obj/effect))
return
if(istype(M, /atom/movable))