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

Merge pull request #4845 from CHOMPStation2/upstream-merge-13660

Browse Source 
[MIRROR] Bugfix Palooza
This commit is contained in:
Nadyr
2022-09-04 18:40:29 -04:00
committed by GitHub
parent 1d132f5aec 33581397f3
commit a06f70b32b
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/multiz/portals_vr.dm
View File

@@ -133,9 +133,9 @@
to_chat(M, "<span class='notice'>Something blocks your way.</span>")
return
temptarg = pick(possible_turfs)
do_noeffect_teleport(M, temptarg, 0)
do_safe_teleport(M, temptarg, 0)
else if (istype(M, /atom/movable))
do_noeffect_teleport(M, target, 0)
do_safe_teleport(M, target, 0)
/obj/structure/portal_event/Destroy()
if(target)