Merge pull request #7142 from PsiOmegaDelta/Singularity

Syndicate beacon power consumption and objective.

code/game/machinery/syndicatebeacon.dm

@@ -19,47 +19,50 @@
 	var/selfdestructing = 0
 	var/charges = 1
 
-	attack_hand(var/mob/user as mob)
+/obj/machinery/syndicate_beacon/attack_hand(var/mob/user as mob)
-		usr.set_machine(src)
+	usr.set_machine(src)
-		var/dat = "<font color=#005500><i>Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...<br>Identity confirmed,<br></i></font>"
+	var/dat = "<font color=#005500><i>Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...<br>Identity confirmed,<br></i></font>"
-		if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai))
+	if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai))
-			if(is_special_character(user))
+		if(is_special_character(user))
-				dat += "<font color=#07700><i>Operative record found. Greetings, Agent [user.name].</i></font><br>"
+			dat += "<font color=#07700><i>Operative record found. Greetings, Agent [user.name].</i></font><br>"
-			else if(charges < 1)
+		else if(charges < 1)
-				dat += "<TT>Connection severed.</TT><BR>"
+			dat += "<TT>Connection severed.</TT><BR>"
-			else
+		else
-				var/honorific = "Mr."
+			var/honorific = "Mr."
-				if(user.gender == FEMALE)
+			if(user.gender == FEMALE)
-					honorific = "Ms."
+				honorific = "Ms."
-				dat += "<font color=red><i>Identity not found in operative database. What can the Syndicate do for you today, [honorific] [user.name]?</i></font><br>"
+			dat += "<font color=red><i>Identity not found in operative database. What can the Syndicate do for you today, [honorific] [user.name]?</i></font><br>"
-				if(!selfdestructing)
+			if(!selfdestructing)
-					dat += "<br><br><A href='?src=\ref[src];betraitor=1;traitormob=\ref[user]'>\"[pick("I want to switch teams.", "I want to work for you.", "Let me join you.", "I can be of use to you.", "You want me working for you, and here's why...", "Give me an objective.", "How's the 401k over at the Syndicate?")]\"</A><BR>"
+				dat += "<br><br><A href='?src=\ref[src];betraitor=1;traitormob=\ref[user]'>\"[pick("I want to switch teams.", "I want to work for you.", "Let me join you.", "I can be of use to you.", "You want me working for you, and here's why...", "Give me an objective.", "How's the 401k over at the Syndicate?")]\"</A><BR>"
-		dat += temptext
+	dat += temptext
-		user << browse(dat, "window=syndbeacon")
+	user << browse(dat, "window=syndbeacon")
-		onclose(user, "syndbeacon")
+	onclose(user, "syndbeacon")
 
-	Topic(href, href_list)
+/obj/machinery/syndicate_beacon/Topic(href, href_list)
-		if(href_list["betraitor"])
+	if(..())
-			if(charges < 1)
+		return
+	if(href_list["betraitor"])
+		if(charges < 1)
+			src.updateUsrDialog()
+			return
+		var/mob/M = locate(href_list["traitormob"])
+		if(M.mind.special_role)
+			temptext = "<i>We have no need for you at this time. Have a pleasant day.</i><br>"
+			src.updateUsrDialog()
+			return
+		charges -= 1
+		switch(rand(1,2))
+			if(1)
+				temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
 				src.updateUsrDialog()
+				spawn(rand(50,200)) selfdestruct()
 				return
-			var/mob/M = locate(href_list["traitormob"])
+		if(istype(M, /mob/living/carbon/human))
-			if(M.mind.special_role)
+			var/mob/living/carbon/human/N = M
-				temptext = "<i>We have no need for you at this time. Have a pleasant day.</i><br>"
+			ticker.mode.equip_traitor(N)
-				src.updateUsrDialog()
+			ticker.mode.traitors += N.mind
-				return
+			N.mind.special_role = "traitor"
-			charges -= 1
+			if(!config.objectives_disabled)
-			switch(rand(1,2))
-				if(1)
-					temptext = "<font color=red><i><b>Double-crosser. You planned to betray us from the start. Allow us to repay the favor in kind.</b></i></font>"
-					src.updateUsrDialog()
-					spawn(rand(50,200)) selfdestruct()
-					return
-			if(istype(M, /mob/living/carbon/human))
-				var/mob/living/carbon/human/N = M
-				ticker.mode.equip_traitor(N)
-				ticker.mode.traitors += N.mind
-				N.mind.special_role = "traitor"
 				var/objective = "Free Objective"
 				switch(rand(1,100))
 					if(1 to 50)
@@ -82,26 +85,23 @@
 				escape_objective.owner = N.mind
 				N.mind.objectives += escape_objective
 
-
+			M << "<B>You have joined the ranks of the Syndicate and become a traitor to the station!</B>"
-				M << "<B>You have joined the ranks of the Syndicate and become a traitor to the station!</B>"
+			show_objectives(M.mind)
-
+			message_admins("[N]/([N.ckey]) has accepted a traitor objective from a syndicate beacon.")
-				message_admins("[N]/([N.ckey]) has accepted a traitor objective from a syndicate beacon.")
-				show_objectives(M.mind)
-
-		src.add_fingerprint(usr)
-		src.updateUsrDialog()
-		return
 
 
-	proc/selfdestruct()
+	src.updateUsrDialog()
-		selfdestructing = 1
+	return
-		spawn() explosion(src.loc, rand(3,8), rand(1,3), 1, 10)
 
 
+/obj/machinery/syndicate_beacon/proc/selfdestruct()
+	selfdestructing = 1
+	spawn() explosion(src.loc, rand(3,8), rand(1,3), 1, 10)
 
-#define SCREWED 32
+////////////////////////////////////////
-
+//Singularity beacon
-/obj/machinery/singularity_beacon //not the best place for it but it's a hack job anyway -- Urist
+////////////////////////////////////////
+/obj/machinery/power/singularity_beacon
 	name = "ominous beacon"
 	desc = "This looks suspicious..."
 	icon = 'icons/obj/singularity.dmi'
@@ -112,105 +112,82 @@
 	layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS
 	stat = 0
 
-	var/active = 0 //It doesn't use up power, so use_power wouldn't really suit it
+	var/active = 0
 	var/icontype = "beacon"
-	var/obj/structure/cable/attached = null
 
 
-	proc/Activate(mob/user = null)
+/obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null)
-		if(!checkWirePower())
+	if(surplus() < 1500)
-			if(user) user << "\blue The connected wire doesn't have enough current."
+		if(user) user << "<span class='notice'>The connected wire doesn't have enough current.</span>"
-			return
+		return
-		for(var/obj/machinery/singularity/singulo in world)
+	for(var/obj/machinery/singularity/singulo in world)
-			if(singulo.z == z)
+		if(singulo.z == z)
-				singulo.target = src
+			singulo.target = src
-		icon_state = "[icontype]1"
+	icon_state = "[icontype]1"
-		active = 1
+	active = 1
-		if(user) user << "\blue You activate the beacon."
+	machines |= src
+	if(user)
+		user << "<span class='notice'>You activate the beacon.</span>"
 
 
-	proc/Deactivate(mob/user = null)
+/obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null)
-		for(var/obj/machinery/singularity/singulo in world)
+	for(var/obj/machinery/singularity/singulo in world)
-			if(singulo.target == src)
+		if(singulo.target == src)
-				singulo.target = null
+			singulo.target = null
-		icon_state = "[icontype]0"
+	icon_state = "[icontype]0"
-		active = 0
+	active = 0
-		if(user) user << "\blue You deactivate the beacon."
+	if(user)
+		user << "<span class='notice'>You deactivate the beacon.</span>"
 
 
-	attack_ai(mob/user as mob)
+/obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob)
+	return
+
+
+/obj/machinery/power/singularity_beacon/attack_hand(var/mob/user as mob)
+	if(anchored)
+		return active ? Deactivate(user) : Activate(user)
+	else
+		user << "<span class='danger'>You need to screw the beacon to the floor first!</span>"
 		return
 
 
-	attack_hand(var/mob/user as mob)
+/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob)
-		if(stat & SCREWED)
+	if(istype(W,/obj/item/weapon/screwdriver))
-			return active ? Deactivate(user) : Activate(user)
+		if(active)
-		else
+			user << "<span class='danger'>You need to deactivate the beacon first!</span>"
-			user << "\red You need to screw the beacon to the floor first!"
 			return
 
-
+		if(anchored)
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
+			anchored = 0
-		if(istype(W,/obj/item/weapon/screwdriver))
+			user << "<span class='notice'>You unscrew the beacon from the floor.</span>"
-			if(active)
+			disconnect_from_network()
-				user << "\red You need to deactivate the beacon first!"
-				return
-
-			if(stat & SCREWED)
-				stat &= ~SCREWED
-				anchored = 0
-				user << "\blue You unscrew the beacon from the floor."
-				attached = null
-				return
-			else
-				var/turf/T = loc
-				if(isturf(T) && !T.intact)
-					attached = locate() in T
-				if(!attached)
-					user << "This device must be placed over an exposed cable."
-					return
-				stat |= SCREWED
-				anchored = 1
-				user << "\blue You screw the beacon to the floor and attach the cable."
-				return
-		..()
-		return
-
-
-	Del()
-		if(active) Deactivate()
-		..()
-
-	/*
-	* Added for a simple way to check power. Verifies that the beacon
-	* is connected to a wire, the wire is part of a powernet (that part's
-	* sort of redundant, since all wires either join or create one when placed)
-	* and that the powernet has at least 1500 power units available for use.
-	* Doesn't use them, though, just makes sure they're there.
-	* - QualityVan, Aug 11 2012
-	*/
-	proc/checkWirePower()
-		if(!attached)
-			return 0
-		var/datum/powernet/PN = attached.get_powernet()
-		if(!PN)
-			return 0
-		if(PN.avail < 1500)
-			return 0
-		return 1
-
-	process()
-		if(!active)
 			return
 		else
-			if(!checkWirePower())
+			if(!connect_to_network())
-				Deactivate()
+				user << "This device must be placed over an exposed cable."
-		return
+				return
+			anchored = 1
+			user << "<span class='notice'>You screw the beacon to the floor and attach the cable.</span>"
+			return
+	..()
+	return
 
 
-/obj/machinery/singularity_beacon/syndicate
+/obj/machinery/power/singularity_beacon/Del()
+	if(active)
+		Deactivate()
+	..()
+
+//stealth direct power usage
+/obj/machinery/power/singularity_beacon/process()
+	if(!active)
+		return PROCESS_KILL
+	else
+		if(draw_power(1500) < 1500)
+			Deactivate()
+
+
+/obj/machinery/power/singularity_beacon/syndicate
 	icontype = "beaconsynd"
 	icon_state = "beaconsynd0"
-
-#undef SCREWED
-

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

@@ -43,7 +43,7 @@
 /obj/item/device/radio/beacon/syndicate/attack_self(mob/user as mob)
 	if(user)
 		user << "\blue Locked In"
-		new /obj/machinery/singularity_beacon/syndicate( user.loc )
+		new /obj/machinery/power/singularity_beacon/syndicate( user.loc )
 		playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
 		del(src)
 	return

code/modules/power/singularity/singularity.dm

@@ -42,7 +42,7 @@ var/global/list/uneatable = list(
 		spawn(temp)
 			del(src)
 	..()
-	for(var/obj/machinery/singularity_beacon/singubeacon in machines)
+	for(var/obj/machinery/power/singularity_beacon/singubeacon in machines)
 		if(singubeacon.active)
 			target = singubeacon
 			break