Merge pull request #291 from SkyMarshal/master

Radio and map update.

code/game/objects/items/weapons/uplinks.dm

@@ -38,7 +38,6 @@ SYNDICATE UPLINK
 			dat += "<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=revolver'>Revolver</A> (6)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=revolver_ammo'>Ammo-357</A> for use with Revolver (2)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=suffocation_revolver_ammo'>Ammo-418</A> for use with Revolver (3)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=xbow'>Energy Crossbow</A> (5)<BR>"
 			dat += "<A href='byond://?src=\ref[src];buy_item=sword'>Energy Sword</A> (4)<BR>"
 			dat += "<BR>"
@@ -99,10 +98,6 @@ SYNDICATE UPLINK
 					if (src.uses >= 2)
 						src.uses -= 2
 						new /obj/item/ammo_magazine/a357(get_turf(src))
-				if("suffocation_revolver_ammo")
-					if (src.uses >= 3)
-						src.uses -= 3
-						new /obj/item/ammo_magazine/a418(get_turf(src))
 				if("xbow")
 					if (src.uses >= 5)
 						src.uses -= 5

code/game/objects/radio/radio.dm

@@ -254,9 +254,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 		// --- Modifications to the mob's identity ---
 
 		// The mob is disguising their identity:
-		if (istype(M.wear_mask, /obj/item/clothing/mask/gas/voice)&&M.wear_mask:vchange)
-			displayname = M.wear_mask:voice
-			jobname = "Unknown"
+		if (istype(M.wear_mask, /obj/item/clothing/mask/gas/voice))
+			if(M.wear_mask:vchange)
+				displayname = M.wear_mask:voice
+				jobname = "Unknown"
 			voicemask = 1
 
 
@@ -299,7 +300,11 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 			for(var/obj/machinery/telecomms/receiver/R in world)
 				R.receive_signal(signal)
 
-		  	// Receiving code can be located in _____.dm
+			// Allinone can act as receivers.
+			for(var/obj/machinery/telecomms/allinone/R in world)
+				R.receive_signal(signal)
+
+		  	// Receiving code can be located in Telecommunications.dm
 			return
 
 
@@ -441,8 +446,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 					freq_text = "Mining"
 				if(1347)
 					freq_text = "Cargo"
-			if(connection.frequency == NUKE_FREQ)
-				freq_text = "Agent"
 			//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
 
 			if(!freq_text)
@@ -453,8 +456,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 
 			if (display_freq==SYND_FREQ)
 				part_a = "<span class='syndradio'><span class='name'>"
-			else if (display_freq==NUKE_FREQ)
-				part_a = "<span class='nukeradio'><span class='name'>"
 			else if (display_freq==COMM_FREQ)
 				part_a = "<span class='comradio'><span class='name'>"
 			else if (display_freq in DEPT_FREQS)

code/game/objects/stool.dm

@@ -135,6 +135,7 @@
 	src.overl.layer = 5
 	src.overl.name = "electrified chair"
 	src.overl.master = src
+	spark.set_up(12, 1, src)
 	return
 
 /obj/structure/stool/chair/e_chair/Del()
@@ -156,6 +157,14 @@
 		//SN src = null
 		del(src)
 		return
+	if(istype(W, /obj/item/device/assembly/signaler))
+		var/obj/item/assembly/shock_kit/kit = src.part1
+		var/obj/item/device/radio/electropack/target = kit.part2
+		var/obj/item/device/assembly/signaler/S = W
+		target.set_frequency(S.frequency)
+		target.code = S.code
+		for(var/mob/M in viewers(src, null))
+			M.show_message("\red [user] has set the electric chair using the [W].")
 	return
 
 /obj/structure/stool/chair/e_chair/verb/toggle_power()
@@ -165,6 +174,8 @@
 
 	if ((usr.stat || usr.restrained() || !( usr.canmove ) || usr.lying))
 		return
+	if(isshocking && on)
+		shock()
 	src.on = !( src.on )
 	src.icon_state = text("e_chair[]", src.on)
 	src.overl.icon_state = text("e_chairo[]", src.on)
@@ -173,37 +184,39 @@
 /obj/structure/stool/chair/e_chair/proc/shock()
 	if (!( src.on ))
 		return
-	if ( (src.last_time + 50) > world.time)
+	if(isshocking)
+		processing_objects.Remove(src)
+		src.icon_state = text("e_chair[]", src.on)
+		src.overl.icon_state = text("e_chairo[]", src.on)
+		for(var/mob/living/M in affected)
+			M.jitteriness = 0
+			M.is_jittery = 0
+			M.anchored = 0
+			affected.Remove(M)
+		isshocking = 0
+		return
+	else
+		src.icon_state = "e_chairs"
+		src.overl.icon_state = "e_chairos"
+		spark.start()
+		for(var/mob/M in hearers(src, null))
+			M.show_message("\red The electric chair went off!.", 3, "\red You hear a deep sharp shock.", 2)
+		processing_objects.Add(src)
+		isshocking = 1
 		return
-	src.last_time = world.time
 
+/obj/structure/stool/chair/e_chair/process()
 	// special power handling
 	var/area/A = get_area(src)
-	if(!isarea(A))
-		return
-	if(!A.powered(EQUIP))
-		return
-	A.use_power(EQUIP, 5000)
-	var/light = A.power_light
-	A.updateicon()
-
-	flick("e_chairs", src)
-	flick("e_chairos", src.overl)
-	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-	s.set_up(12, 1, src)
-	s.start()
+	if(isarea(A) && A.powered(EQUIP))
+		A.use_power(EQUIP, 5000)
 	for(var/mob/living/M in src.loc)
-		M.burn_skin(85)
-		M << "\red <B>You feel a deep shock course through your body!</B>"
-		sleep(1)
-		M.burn_skin(85)
+		affected.Add(M)
+		M.make_jittery(1000)
+		M.anchored = 1
 		M.Stun(600)
-	for(var/mob/M in hearers(src, null))
-		M.show_message("\red The electric chair went off!.", 3, "\red You hear a deep sharp shock.", 2)
-
-	A.power_light = light
-	A.updateicon()
-	return
+		M.burn_skin(10)
+		spark.start()
 
 /obj/structure/stool/chair/ex_act(severity)
 	unbuckle_all()