Merge pull request #4649 from Citadel-Station-13/upstream-merge-34041

[MIRROR] Fixes afterattack running when clicking a portal
2018-01-03 15:24:26 -06:00
parent b9cef4a3a4 8edebc4ff4
commit f2b1898235
1 changed files with 1 additions and 0 deletions
@@ -41,6 +41,7 @@
 /obj/effect/portal/attackby(obj/item/W, mob/user, params)
 	if(user && Adjacent(user))
 		user.forceMove(get_turf(src))
+		return TRUE

 /obj/effect/portal/Crossed(atom/movable/AM, oldloc)
 	if(isobserver(AM))