From a80ab73951ce32b1f3f88e25fa3d45b843182669 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 8 Mar 2018 01:09:05 -0500
Subject: [PATCH] Update net_snare.dm

---
 .../projectile/energy/net_snare.dm            | 103 +-----------------
 1 file changed, 1 insertion(+), 102 deletions(-)

diff --git a/code/modules/projectiles/projectile/energy/net_snare.dm b/code/modules/projectiles/projectile/energy/net_snare.dm
index 8cf4dc6f41..48544d1c28 100644
--- a/code/modules/projectiles/projectile/energy/net_snare.dm
+++ b/code/modules/projectiles/projectile/energy/net_snare.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /obj/item/projectile/energy/net
 	name = "energy netting"
 	icon_state = "e_netting"
@@ -32,7 +31,7 @@
 
 /obj/effect/nettingportal/Initialize()
 	. = ..()
-	var/obj/item/device/radio/beacon/teletarget = null
+	var/obj/item/device/beacon/teletarget = null
 	for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
 		if(com.target)
 			if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
@@ -97,103 +96,3 @@
 /obj/item/projectile/energy/trap/cyborg/on_range()
 	do_sparks(1, TRUE, src)
 	qdel(src)
-=======
-/obj/item/projectile/energy/net
-	name = "energy netting"
-	icon_state = "e_netting"
-	damage = 10
-	damage_type = STAMINA
-	hitsound = 'sound/weapons/taserhit.ogg'
-	range = 10
-
-/obj/item/projectile/energy/net/Initialize()
-	. = ..()
-	SpinAnimation()
-
-/obj/item/projectile/energy/net/on_hit(atom/target, blocked = FALSE)
-	if(isliving(target))
-		var/turf/Tloc = get_turf(target)
-		if(!locate(/obj/effect/nettingportal) in Tloc)
-			new /obj/effect/nettingportal(Tloc)
-	..()
-
-/obj/item/projectile/energy/net/on_range()
-	do_sparks(1, TRUE, src)
-	..()
-
-/obj/effect/nettingportal
-	name = "DRAGnet teleportation field"
-	desc = "A field of bluespace energy, locking on to teleport a target."
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "dragnetfield"
-	light_range = 3
-	anchored = TRUE
-
-/obj/effect/nettingportal/Initialize()
-	. = ..()
-	var/obj/item/device/beacon/teletarget = null
-	for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
-		if(com.target)
-			if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
-				teletarget = com.target
-
-	addtimer(CALLBACK(src, .proc/pop, teletarget), 30)
-
-/obj/effect/nettingportal/proc/pop(teletarget)
-	if(teletarget)
-		for(var/mob/living/L in get_turf(src))
-			do_teleport(L, teletarget, 2)//teleport what's in the tile to the beacon
-	else
-		for(var/mob/living/L in get_turf(src))
-			do_teleport(L, L, 15) //Otherwise it just warps you off somewhere.
-
-	qdel(src)
-
-/obj/effect/nettingportal/singularity_act()
-	return
-
-/obj/effect/nettingportal/singularity_pull()
-	return
-
-/obj/item/projectile/energy/trap
-	name = "energy snare"
-	icon_state = "e_snare"
-	nodamage = 1
-	knockdown = 20
-	hitsound = 'sound/weapons/taserhit.ogg'
-	range = 4
-
-/obj/item/projectile/energy/trap/on_hit(atom/target, blocked = FALSE)
-	if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - drop a trap
-		new/obj/item/restraints/legcuffs/beartrap/energy(get_turf(loc))
-	else if(iscarbon(target))
-		var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy(get_turf(target))
-		B.Crossed(target)
-	..()
-
-/obj/item/projectile/energy/trap/on_range()
-	new /obj/item/restraints/legcuffs/beartrap/energy(loc)
-	..()
-
-/obj/item/projectile/energy/trap/cyborg
-	name = "Energy Bola"
-	icon_state = "e_snare"
-	nodamage = 1
-	knockdown = 0
-	hitsound = 'sound/weapons/taserhit.ogg'
-	range = 10
-
-/obj/item/projectile/energy/trap/cyborg/on_hit(atom/target, blocked = FALSE)
-	if(!ismob(target) || blocked >= 100)
-		do_sparks(1, TRUE, src)
-		qdel(src)
-	if(iscarbon(target))
-		var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(target))
-		B.Crossed(target)
-	QDEL_IN(src, 10)
-	..()
-
-/obj/item/projectile/energy/trap/cyborg/on_range()
-	do_sparks(1, TRUE, src)
-	qdel(src)
->>>>>>> 5140cff... [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] (#35475)