Merge pull request #8515 from Kyep/depot

Reworks Syndicate Supply Depot

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

@@ -98,4 +98,8 @@
 
 /obj/item/pizza_bomb/New()
 	..()
-	correct_wire = pick(wires)
+	correct_wire = pick(wires)
+
+/obj/item/pizza_bomb/autoarm
+	timer_set = 1
+	timer = 10

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

@@ -54,9 +54,15 @@
 	name = "suspicious beacon"
 	desc = "A label on it reads: <i>Activate to have a singularity beacon teleported to your location</i>."
 	origin_tech = "bluespace=6;syndicate=5"
-	syndicate = 1
+	syndicate = TRUE
+	var/obj/machinery/computer/syndicate_depot/teleporter/mycomputer
 
-/obj/item/radio/beacon/syndicate/attack_self(mob/user as mob)
+/obj/item/radio/beacon/syndicate/Destroy()
+	if(mycomputer)
+		mycomputer.mybeacon = null
+	return ..()
+
+/obj/item/radio/beacon/syndicate/attack_self(mob/user)
 	if(user)
 		to_chat(user, "<span class='notice'>Locked In</span>")
 		new /obj/machinery/power/singularity_beacon/syndicate( user.loc )
@@ -69,7 +75,7 @@
 	desc = "A label on it reads: <i>Warning: Activating this device will send a high-ordinance explosive to your location</i>."
 	origin_tech = "bluespace=5;syndicate=5"
 
-/obj/item/radio/beacon/syndicate/bomb/attack_self(mob/user as mob)
+/obj/item/radio/beacon/syndicate/bomb/attack_self(mob/user)
 	if(user)
 		to_chat(user, "<span class='notice'>Locked In</span>")
 		new /obj/machinery/syndicatebomb( user.loc )