Merge pull request #96 from SamCroswell/master

Energy Net Hotfix

code/game/gamemodes/events/ninja_abilities.dm

@@ -201,7 +201,11 @@ Must right click on a mob to activate.*/
 			spawn(0)
 				U.Beam(M,"n_beam",,15)
 			M.anchored = 1//Anchors them so they can't move.
-			M.SetWeakened(500)
+			var/obj/effect/stop/S
+			S = new /obj/effect/stop
+			S.victim = M
+			S.loc = M.loc
+
 			var/obj/effect/energy_net/E = new /obj/effect/energy_net(M.loc)
 			E.layer = M.layer+1//To have it appear one layer above the mob.
 			for(var/mob/O in viewers(U, 3))

code/game/gamemodes/events/ninja_equipment.dm

@@ -1330,7 +1330,10 @@ It is possible to destroy the net by the occupant or someone else.
 				if(affecting)
 					var/mob/living/carbon/M = affecting
 					M.anchored = 0
-					M.SetWeakened(0)
+					if(locate(/obj/effect/stop/, M.loc))
+						for(var/obj/effect/stop/S in M.loc)
+							if(S.victim == M)
+								del(S)
 					for(var/mob/O in viewers(src, 3))
 						O.show_message(text("[] was recovered from the energy net!", M.name), 1, text("You hear a grunt."), 2)
 					if(!isnull(master))//As long as they still exist.
@@ -1387,7 +1390,10 @@ It is possible to destroy the net by the occupant or someone else.
 				master << "\blue <b>SUCCESS</b>: \black transport procedure of \the [affecting] complete."
 
 			M.anchored = 0//Important.
-			M.SetWeakened(0)
+			if(locate(/obj/effect/stop/, M.loc))
+				for(var/obj/effect/stop/S in M.loc)
+					if(S.victim == M)
+						del(S)
 
 		else//And they are free.
 			M << "\blue You are free of the net!"