Lagholes now wormholes

code/game/objects/effects/portals.dm

@@ -1,4 +1,9 @@
-GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal)
+//GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal)
+// No fucking idea what this proc does but it doesn't seem to
+// help when we need to refere to the global portals list.
+
+var/global/list/portals = list()					// Just a list for portals <3
+
 
 /obj/effect/portal
 	name = "portal"
@@ -13,28 +18,43 @@ GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal)
 	anchored = 1.0
 
 /obj/effect/portal/Bumped(mob/M as mob|obj)
-	spawn(0)
-		src.teleport(M)
-		return
-	return
+//	spawn(0)
+//		src.teleport(M)
+//		return
+//	return
+	teleport(M)
 
 /obj/effect/portal/Crossed(AM as mob|obj)
-	spawn(0)
-		src.teleport(AM)
-		return
-	return
+//	spawn(0)
+//		src.teleport(AM)
+//		return
+//	return
+	teleport(AM)
 
 /obj/effect/portal/attack_hand(mob/user as mob)
-	spawn(0)
-		src.teleport(user)
-		return
-	return
+//	spawn(0)
+//		src.teleport(user)
+//		return
+//	return
+	teleport(user)
 
-/obj/effect/portal/New()
-	spawn(300)
-		qdel(src)
-		return
-	return
+/obj/effect/portal/New(loc, turf/target, creator=null, lifespan=300)
+	//I'm actually concerned with the ammount of spaghet on my plate today. - Jon
+//	spawn(300)
+//		qdel(src)
+//		return
+//	return
+	portals += src
+	src.loc = loc
+	src.target = target
+	src.creator = creator
+	if(lifespan > 0)
+		spawn(lifespan)
+			qdel(src)
+
+/obj/effect/portal/Destroy()
+	portals -= src
+	return ..()
 
 /obj/effect/portal/proc/teleport(atom/movable/M as mob|obj)
 	if(istype(M, /obj/effect)) //sparks don't teleport
@@ -53,3 +73,9 @@ GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal)
 		else
 			do_teleport(M, target, 1) ///You will appear adjacent to the beacon
 
+// New addition to remove portals via multitools like on codebases like Paradise. - Jon
+/obj/effect/portal/attackby(obj/item/A, mob/user)
+	if(istype(A, /obj/item/device/multitool))
+		qdel(src)
+
+

code/game/objects/items/weapons/teleportation.dm

@@ -156,7 +156,7 @@ Frequency:
 	if ((user.get_active_hand() != src || user.stat || user.restrained()))
 		return
 	var/count = 0	//num of portals from this teleport in world
-	for(var/obj/effect/portal/PO in all_portals)
+	for(var/obj/effect/portal/PO in portals)
 		if(PO.creator == src)	count++
 	if(count >= 3)
 		user.show_message("<span class='notice'>\The [src] is recharging!</span>")