From 263afa7df49e2b4c6e6065a8cd9ffdee18832bd3 Mon Sep 17 00:00:00 2001
From: PKPenguin321 <pkpenguin321.git@gmail.com>
Date: Fri, 27 May 2016 19:32:01 -0700
Subject: [PATCH] Teleprods fixes (#17965)

* fixes teleprods creating igniters

* undoes rogue dme change
---
 code/game/objects/items/weapons/teleprod.dm | 31 +++------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm
index 6131158a4b0..b36fade0feb 100644
--- a/code/game/objects/items/weapons/teleprod.dm
+++ b/code/game/objects/items/weapons/teleprod.dm
@@ -29,33 +29,10 @@
 				user.unEquip(src)
 			user.unEquip(I)
 			user.put_in_hands(S)
-			user << "<span class='notice'>You clamp the bluespace crystal securely with the wirecutters.</span>"
-			I.loc = S//places the crystal into the contents of the prod for later removal
-			qdel(src)
-		else
-			user.visible_message("<span class='warning'>You can't install the crystal onto the stunprod while it has a powercell installed!</span>")
-	else
-		return ..()
-
-/obj/item/weapon/melee/baton/cattleprod/teleprod/attack_self(mob/user, obj/item/I)//handles removing the bluespace crystal + turning the prod on and off
-	if(bcell && bcell.charge > hitcost)
-		status = !status
-		user << "<span class='notice'>[src] is now [status ? "on" : "off"].</span>"
-		playsound(loc, "sparks", 75, 1, -1)
-	else
-		status = 0
-		if(!bcell)
-			var/obj/item/weapon/melee/baton/cattleprod/S = new /obj/item/weapon/melee/baton/cattleprod
-			if(!remove_item_from_storage(user))
-				user.unEquip(src)
-			var/turf/open/floorloc = get_turf(user)
-			floorloc.contents += contents//drops the contents of the prod (the only content should be the crystal) at the user's feet
-			user.unEquip(I)
-			user.put_in_hands(S)
-			user << "<span class='notice'>You carefully remove the bluespace crystal from the teleprod.</span>"
+			user << "<span class='notice'>You place the bluespace crystal firmly into the igniter.</span>"
 			qdel(I)
 			qdel(src)
 		else
-			user << "<span class='warning'>[src] is out of charge.</span>"
-	update_icon()
-	add_fingerprint(user)
\ No newline at end of file
+			user.visible_message("<span class='warning'>You can't put the crystal onto the stunprod while it has a power cell installed!</span>")
+	else
+		return ..()