From e06933ec09c1c9f7eb2c4e2c2d6cb540cb310f4e Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Tue, 26 Jul 2016 13:21:06 -0400
Subject: [PATCH] tweakssss

---
 code/game/objects/items/weapons/teleprod.dm | 19 +++++++++----------
 code/modules/crafting/recipes.dm            | 12 ------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm
index bccb4a3014c..7c9f7c14f9f 100644
--- a/code/game/objects/items/weapons/teleprod.dm
+++ b/code/game/objects/items/weapons/teleprod.dm
@@ -7,16 +7,15 @@
 
 /obj/item/weapon/melee/baton/cattleprod/teleprod/attack(mob/living/carbon/M, mob/living/carbon/user)//handles making things teleport when hit
 	..()
-	if(status && (CLUMSY in user.mutations) && prob(50))
-		user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
-							"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
-		user.Weaken(stunforce*3)
-		deductcharge(hitcost)
-		do_teleport(user, get_turf(user), 50)//honk honk
-	else
-		if(status)
-			if(iscarbon(M) && !M.anchored)
-				do_teleport(M, get_turf(M), 15)
+	if(status)
+		if((CLUMSY in user.mutations) && prob(50))
+			user.visible_message("<span class='danger'>[user] accidentally hits themself with [src]!</span>", \
+								"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
+			user.Weaken(stunforce*3)
+			deductcharge(hitcost)
+			do_teleport(user, get_turf(user), 50)//honk honk
+		else if(iscarbon(M) && !M.anchored)
+			do_teleport(M, get_turf(M), 15)
 
 /obj/item/weapon/melee/baton/cattleprod/attackby(obj/item/I, mob/user, params)//handles sticking a crystal onto a stunprod to make a teleprod
 	if(istype(I, /obj/item/weapon/ore/bluespace_crystal))
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 6d713221da5..6f946146aa4 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -55,18 +55,6 @@
 	parts = list(/obj/item/weapon/stock_parts/cell = 1)
 	category = CAT_WEAPON
 
-/datum/crafting_recipe/teleprod
-	name = "Teleprod"
-	result = /obj/item/weapon/melee/baton/cattleprod/teleprod
-	reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1,
-				/obj/item/stack/rods = 1,
-				/obj/item/weapon/wirecutters = 1,
-				/obj/item/weapon/stock_parts/cell = 1,
-				/obj/item/weapon/ore/bluespace_crystal = 1)
-	time = 40
-	parts = list(/obj/item/weapon/stock_parts/cell = 1)
-	category = CAT_WEAPON
-
 /datum/crafting_recipe/bola
 	name = "Bola"
 	result = /obj/item/weapon/restraints/legcuffs/bola