From c24bf8efd66a3a1157cdafd3f136d774c06f7763 Mon Sep 17 00:00:00 2001
From: "uhangi@gmail.com"
 <uhangi@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 6 Sep 2011 01:32:46 +0000
Subject: [PATCH] -Adding electropack and screwdriver to the autolathe
 -Switching around some items that need to be hacked in order to get from the
 autolathe -Fixing electropack bug -You can now make radio signalers,
 headsets, and station bounced radios from the autolathe

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2139 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/obj/radio.dm              |  4 ++++
 code/defines/obj/weapon.dm             |  2 ++
 code/game/machinery/autolathe.dm       | 13 +++++++++----
 code/game/objects/radio/electropack.dm |  3 +++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/code/defines/obj/radio.dm b/code/defines/obj/radio.dm
index 9560c8af9d5..2f96caef684 100644
--- a/code/defines/obj/radio.dm
+++ b/code/defines/obj/radio.dm
@@ -21,6 +21,8 @@
 	throw_speed = 2
 	throw_range = 9
 	w_class = 2
+	g_amt = 25
+	m_amt = 75
 	var/const
 		WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
 		WIRE_RECEIVE = 2
@@ -58,6 +60,8 @@
 	desc = "An intercom that fits over the head."
 	icon_state = "headset"
 	item_state = "headset"
+	g_amt = 0
+	m_amt = 75
 	var
 		protective_temperature = 0
 		translate_binary = 0
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index a10f0891f01..06480e97fee 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1160,6 +1160,8 @@
 	throwforce = 5.0
 	throw_speed = 3
 	throw_range = 5
+	g_amt = 0
+	m_amt = 75
 
 /obj/item/weapon/shard
 	name = "shard"
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 8871c38463c..590299696e7 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -230,6 +230,7 @@ var/global/list/autolathe_recipes = list( \
 		new /obj/item/device/multitool(), \
 		new /obj/item/device/t_scanner(), \
 		new /obj/item/weapon/weldingtool(), \
+		new /obj/item/weapon/screwdriver(), \
 		new /obj/item/weapon/wirecutters(), \
 		new /obj/item/weapon/wrench(), \
 		new /obj/item/clothing/head/helmet/welding(), \
@@ -248,15 +249,19 @@ var/global/list/autolathe_recipes = list( \
 		new /obj/item/ammo_casing/shotgun/beanbag(), \
 		new /obj/item/ammo_magazine/c38(), \
 		new /obj/item/device/taperecorder(), \
+		new /obj/item/device/igniter(), \
+		new /obj/item/device/infra_sensor(), \
+		new /obj/item/device/radio/signaler(), \
+		new /obj/item/device/radio/headset(), \
+		new /obj/item/device/radio(), \
+		new /obj/item/device/infra(), \
+		new /obj/item/device/timer(), \
 	)
 
 var/global/list/autolathe_recipes_hidden = list( \
 		new /obj/item/weapon/flamethrower/full(), \
-		new /obj/item/device/igniter(), \
-		new /obj/item/device/timer(), \
-		new /obj/item/device/infra_sensor(), \
-		new /obj/item/device/infra(), \
 		new /obj/item/weapon/rcd(), \
+		new /obj/item/device/radio/electropack(), \
 		new /obj/item/weapon/weldingtool/largetank(), \
 		new /obj/item/weapon/handcuffs(), \
 		new /obj/item/ammo_magazine(), \
diff --git a/code/game/objects/radio/electropack.dm b/code/game/objects/radio/electropack.dm
index 74406e02970..a5b7f88db0f 100644
--- a/code/game/objects/radio/electropack.dm
+++ b/code/game/objects/radio/electropack.dm
@@ -5,6 +5,8 @@
 	var/code = 2
 	var/on = 0
 	var/e_pads = 0.0
+	g_amt = 2500
+	m_amt = 10000
 	frequency = 1449
 	w_class = 5.0
 	flags = 323
@@ -43,6 +45,7 @@
 		else
 			user.show_message("\blue The electric pads have been reinserted!")
 		src.add_fingerprint(user)
+		return
 	else
 		if (istype(W, /obj/item/clothing/head/helmet))
 			var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )