From 3b3b45c03c7cbf65df5727cd62d23207b60cf100 Mon Sep 17 00:00:00 2001
From: kevinz000 <kevinz1234567890@gmail.com>
Date: Tue, 3 Oct 2017 02:37:16 -0700
Subject: [PATCH 1/2] Fixes/tweaks wormholes event and portals (#30846)

* fix

* THERE WE GO

* Update portals.dm
---
 code/game/objects/effects/portals.dm | 6 +++---
 code/modules/events/wormholes.dm     | 9 ++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 7b53b6c531..8bf0580e15 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -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)
 	. = ..()
diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm
index 00b4ce4e98..74169df074 100644
--- a/code/modules/events/wormholes.dm
+++ b/code/modules/events/wormholes.dm
@@ -26,7 +26,7 @@
 
 	for(var/i = 1, i <= number_of_wormholes, i++)
 		var/turf/T = pick(pick_turfs)
-		wormholes += new /obj/effect/portal/wormhole(T, null, 300, null, FALSE)
+		wormholes += new /obj/effect/portal/wormhole(T, null, 0, null, FALSE)
 
 /datum/round_event/wormholes/announce()
 	priority_announce("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert", 'sound/ai/spanomalies.ogg')
@@ -40,6 +40,7 @@
 
 /datum/round_event/wormholes/end()
 	QDEL_LIST(wormholes)
+	wormholes = null
 
 /obj/effect/portal/wormhole
 	name = "wormhole"
@@ -48,12 +49,6 @@
 	icon_state = "anom"
 	mech_sized = TRUE
 
-/obj/effect/portal/wormhole/attack_hand(mob/user)
-	teleport(user)
-
-/obj/effect/portal/wormhole/attackby(obj/item/I, mob/user, params)
-	teleport(user)
-
 /obj/effect/portal/wormhole/teleport(atom/movable/M)
 	if(istype(M, /obj/effect))	//sparks don't teleport
 		return