cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11688 from Markolie/swarmerfix

Browse Source 
Fix gutlunches not eating and tesla wormhole fix
This commit is contained in:
Crazy Lemon
2019-06-06 20:13:18 -07:00
committed by GitHub
parent 10ef2311ab f7c96702f2
commit 54257fec69
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/portals.dm
+9 -3
View File
@@ -79,14 +79,20 @@
user.forceMove(get_turf(src))
return TRUE
/obj/effect/portal/proc/teleport(atom/movable/M, force = FALSE)
/obj/effect/portal/proc/can_teleport(atom/movable/M)
. = TRUE
if(!istype(M))
return FALSE
. = FALSE
if(!M.simulated || iseffect(M))
return FALSE
. = FALSE
if(M.anchored && ismecha(M))
. = FALSE
/obj/effect/portal/proc/teleport(atom/movable/M)
if(!can_teleport(M))
return FALSE
if(!target)