Merge pull request #510 from Markolie/master

Syndicate teleporter fix, fix fire alarm in engineering that gets EMP'ed

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

@@ -5,7 +5,19 @@
 	item_state = "signaler"
 	var/code = "electronic"
 	origin_tech = "bluespace=1"
+	var/emagged = 0
+	var/syndicate = 0
 
+/obj/item/device/radio/beacon/attackby(I as obj, mob/living/user as mob)
+	if(istype(I,/obj/item/weapon/card/emag)) // If hit by an emag.
+		var/obj/item/weapon/card/emag/E = I
+		if(!emagged)
+			if(E.uses)
+				E.uses--
+				emagged = 1
+				syndicate = 1
+				user << "\blue The This beacon now only be locked on to by emagged teleporters!"
+	
 /obj/item/device/radio/beacon/hear_talk()
 	return
 
@@ -39,6 +51,7 @@
 	name = "suspicious beacon"
 	desc = "A label on it reads: <i>Activate to have a singularity beacon teleported to your location</i>."
 	origin_tech = "bluespace=1;syndicate=7"
+	syndicate = 1
 
 /obj/item/device/radio/beacon/syndicate/attack_self(mob/user as mob)
 	if(user)
@@ -64,7 +77,7 @@
 
 /obj/item/device/telepad_beacon
 	name = "Telepad Beacon"
-	desc = "Use to warp in a cargo telepad."
+	desc = "Used to warp in a cargo telepad."
 	icon = 'icons/obj/radio.dmi'
 	icon_state = "beacon"
 	item_state = "signaler"

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

@@ -21,9 +21,9 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 	var/broadcasting = 0
 	var/listening = 1
 	var/freerange = 0 // 0 - Sanitize frequencies, 1 - Full range
-	var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
+	var/list/channels = list() //see communications.dm for full list. First channels is a "default" for :h
 	var/subspace_transmission = 0
-	var/syndie = 0//Holder to see if it's a syndicate encrpyed radio
+	var/syndie = 0//Holder to see if it's a syndicate encrypted radio
 	var/maxf = 1499
 //			"Example" = FREQ_LISTENING|FREQ_BROADCASTING
 	flags = FPRINT | CONDUCT | TABLEPASS