shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes/tweaks wormholes event and portals (#30846)

Browse Source 
* fix

* THERE WE GO

* Update portals.dm
This commit is contained in:
kevinz000
2017-10-03 02:37:16 -07:00
committed by CitadelStationBot
parent 22b6f538d6
commit 3b3b45c03c
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/portals.dm
+3 -3
View File
@@ -39,10 +39,10 @@
/obj/effect/portal/attackby(obj/item/W, mob/user, params)
if(user && Adjacent(user))
teleport(user)
user.forceMove(get_turf(src))
/obj/effect/portal/Crossed(atom/movable/AM, oldloc)
if(get_turf(oldloc) == get_turf(linked))
if(linked && (get_turf(oldloc) == get_turf(linked)))
return ..()
if(!teleport(AM))
return ..()
@@ -52,7 +52,7 @@
/obj/effect/portal/attack_hand(mob/user)
if(Adjacent(user))
teleport(user)
user.forceMove(get_turf(src))
/obj/effect/portal/Initialize(mapload, _creator, _lifespan = 0, obj/effect/portal/_linked, automatic_link = FALSE, turf/hard_target_override, atmos_link_override)
. = ..()