Bug fixes

code/game/objects/items/devices/radio/electropack.dm

@@ -107,7 +107,7 @@
 
 		M.Weaken(10)
 
-	if(master && wires & 1)
+	if(master)
 		master.receive_signal()
 	return
 

code/game/objects/items/devices/radio/radio.dm

@@ -196,7 +196,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 /obj/item/device/radio/proc/isWireCut(var/index)
 	return wires.IsIndexCut(index)
 
-/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel) //BS12 EDIT
+/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = list(1)) //BS12 EDIT
 	var/datum/radio_frequency/connection = null
 	if(channel && channels && channels.len > 0)
 		if (channel == "department")
@@ -215,7 +215,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	Broadcast_Message(connection, A,
 						0, "*garbled automated announcement*", src,
 						message, from, "Automated Announcement", from, "synthesized voice",
-						4, 0, list(1), 1459)
+						4, 0, zlevel, connection.frequency)
 	del(A)
 	return
 

code/game/objects/items/stacks/stack.dm

@@ -161,15 +161,15 @@
 			return
 	return
 
-/obj/item/stack/proc/use(var/amount)
-	src.amount-=amount
-	if (src.amount<=0)
-		var/oldsrc = src
-		src = null //dont kill proc after del()
+/obj/item/stack/proc/use(var/used)
+	if (amount < used)
+		return 0
+	amount -= used
+	if (amount <= 0)
 		if(usr)
-			usr.before_take_item(oldsrc)
-		qdel(oldsrc)
-	return
+			usr.before_take_item(src, 1)
+		qdel(src)
+	return 1
 
 /obj/item/stack/proc/add_to_stacks(mob/usr as mob)
 	var/obj/item/stack/oldsrc = src

code/game/objects/structures/electricchair.dm

@@ -34,6 +34,7 @@
 	else
 		on = 1
 		icon_state = "echair1"
+		shock()
 	usr << "<span class='notice'>You switch [on ? "on" : "off"] [src].</span>"
 	return
 
@@ -70,8 +71,10 @@
 		sleep(1)
 		buckled_mob.burn_skin(85)
 		buckled_mob.Stun(600)
+	on = 0
 	visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='danger'>You hear a deep sharp shock!</span>")
 
 	A.power_light = light
 	A.updateicon()
-	return
+	return
+