Merge branch 'master' into upstream-merge-30297

code/game/gamemodes/changeling/powers/augmented_eyesight.dm

@@ -1,4 +1,4 @@
-//Augmented Eyesight: Gives you thermal and night vision - bye bye, flashlights. Also, high DNA cost because of how powerful it is.
+//Augmented Eyesight: Gives you x-ray vision or protection from flashes. Also, high DNA cost because of how powerful it is.
 //Possible todo: make a custom message for directing a penlight/flashlight at the eyes - not sure what would display though.
 
 /obj/effect/proc_holder/changeling/augmented_eyesight
@@ -7,21 +7,31 @@
 	helptext = "Grants us thermal vision or flash protection. We will become a lot more vulnerable to flash-based devices while thermal vision is active."
 	chemical_cost = 0
 	dna_cost = 2 //Would be 1 without thermal vision
-	active = 0 //Whether or not vision is enhanced
+	active = FALSE
+
+/obj/effect/proc_holder/changeling/augmented_eyesight/on_purchase(mob/user) //The ability starts inactive, so we should be protected from flashes.
+	var/obj/item/organ/eyes/E = user.getorganslot("eye_sight")
+	if (E)
+		E.flash_protect = 2 //Adjust the user's eyes' flash protection
+		to_chat(user, "We adjust our eyes to protect them from bright lights.")
+	else
+		to_chat(user, "We can't adjust our eyes if we don't have any!")
 
 /obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(mob/living/carbon/human/user)
 	if(!istype(user))
 		return
 	var/obj/item/organ/eyes/E = user.getorganslot("eye_sight")
 	if(E)
-		if(E.flash_protect)
-			E.sight_flags |= SEE_MOBS
-			E.flash_protect = -1
+		if(!active)
+			E.sight_flags |= SEE_MOBS | SEE_OBJS | SEE_TURFS //Add sight flags to the user's eyes
+			E.flash_protect = -1 //Adjust the user's eyes' flash protection
 			to_chat(user, "We adjust our eyes to sense prey through walls.")
+			active = TRUE //Defined in code/modules/spells/spell.dm
 		else
-			E.sight_flags -= SEE_MOBS
-			E.flash_protect = 2
+			E.sight_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS //Remove sight flags from the user's eyes
+			E.flash_protect = 2 //Adjust the user's eyes' flash protection
 			to_chat(user, "We adjust our eyes to protect them from bright lights.")
+			active = FALSE
 		user.update_sight()
 	else
 		to_chat(user, "We can't adjust our eyes if we don't have any!")
@@ -31,7 +41,11 @@
 	return 1
 
 
-/obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user)
+/obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user) //Get rid of x-ray vision and flash protection when the user refunds this ability
 	var/obj/item/organ/eyes/E = user.getorganslot("eye_sight")
 	if(E)
-		E.sight_flags -= SEE_MOBS
+		if (active)
+			E.sight_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS
+		else
+			E.flash_protect = 0
+		user.update_sight()

code/game/gamemodes/changeling/powers/mutations.dm

@@ -247,7 +247,7 @@
 
 
 /obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj)
-	to_chat(user, "<span class='warning'>The [name] is not ready yet.<span>")
+	to_chat(user, "<span class='warning'>The [name] is not ready yet.</span>")
 
 /obj/item/gun/magic/tentacle/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -343,10 +343,10 @@
 								on_hit(I) //grab the item as if you had hit it directly with the tentacle
 								return 1
 							else
-								to_chat(firer, "<span class='danger'>You can't seem to pry [I] off [C]'s hands!<span>")
+								to_chat(firer, "<span class='danger'>You can't seem to pry [I] off [C]'s hands!</span>")
 								return 0
 						else
-							to_chat(firer, "<span class='danger'>[C] has nothing in hand to disarm!<span>")
+							to_chat(firer, "<span class='danger'>[C] has nothing in hand to disarm!</span>")
 							return 0
 
 					if(INTENT_GRAB)

code/game/gamemodes/changeling/powers/tiny_prick.dm

@@ -73,7 +73,7 @@
 	if(!selected_dna)
 		return
 	if(NOTRANSSTING in selected_dna.dna.species.species_traits)
-		to_chat(user, "<span class = 'notice'>That DNA is not compatible with changeling retrovirus!")
+		to_chat(user, "<span class = 'notice'>That DNA is not compatible with changeling retrovirus!</span>")
 		return
 	..()
 

code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm

@@ -26,8 +26,8 @@
 			to_chat(user, "<span class='inathneq'>An emergency shuttle has arrived and this prism is no longer useful; attempt to activate it to gain a partial refund of components used.</span>")
 		else
 			var/efficiency = get_efficiency_mod(TRUE)
-			to_chat(user, "<span class='inathneq_small'>It requires at least <b>[get_delay_cost()]W</b> of power to attempt to delay the arrival of an emergency shuttle by <b>[2 * efficiency]</b> minutes.</span>")
-			to_chat(user, "<span class='inathneq_small'>This cost increases by <b>[delay_cost_increase]W</b> for every previous activation.</span>")
+			to_chat(user, "<span class='inathneq_small'>It requires at least <b>[DisplayPower(get_delay_cost())]</b> of power to attempt to delay the arrival of an emergency shuttle by <b>[2 * efficiency]</b> minutes.</span>")
+			to_chat(user, "<span class='inathneq_small'>This cost increases by <b>[DisplayPower(delay_cost_increase)]</b> for every previous activation.</span>")
 
 /obj/structure/destructible/clockwork/powered/prolonging_prism/forced_disable(bad_effects)
 	if(active)
@@ -126,7 +126,7 @@
 			if(!hex_combo)
 				hex_combo = mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER)
 			else
-				hex_combo.overlays += mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER)
+				hex_combo.add_overlay(mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER))
 	if(hex_combo) //YOU BUILT A HEXAGON
 		hex_combo.pixel_x = -16
 		hex_combo.pixel_y = -16

code/game/gamemodes/cult/cult.dm

@@ -144,7 +144,7 @@
 		to_chat(mob, "<span class='userdanger'>Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).</span>")
 		return 0
 	else
-		to_chat(mob, "<span class='danger'>You have a [item_name] in your [where].")
+		to_chat(mob, "<span class='danger'>You have a [item_name] in your [where].</span>")
 		if(where == "backpack")
 			var/obj/item/storage/B = mob.back
 			B.orient2hud(mob)

code/game/gamemodes/cult/cult_comms.dm

@@ -118,7 +118,7 @@
 			if(B.current)
 				B.current.update_action_buttons_icon()
 				if(!B.current.incapacitated())
-					to_chat(B.current,"<span class='cultlarge'>[Nominee] has died in the process of attempting to win the cult's support!")
+					to_chat(B.current,"<span class='cultlarge'>[Nominee] has died in the process of attempting to win the cult's support!</span>")
 		return FALSE
 	if(!Nominee.mind)
 		GLOB.cult_vote_called = FALSE
@@ -126,7 +126,7 @@
 			if(B.current)
 				B.current.update_action_buttons_icon()
 				if(!B.current.incapacitated())
-					to_chat(B.current,"<span class='cultlarge'>[Nominee] has gone catatonic in the process of attempting to win the cult's support!")
+					to_chat(B.current,"<span class='cultlarge'>[Nominee] has gone catatonic in the process of attempting to win the cult's support!</span>")
 		return FALSE
 	if(LAZYLEN(yes_voters) <= LAZYLEN(asked_cultists) * 0.5)
 		GLOB.cult_vote_called = FALSE
@@ -134,7 +134,7 @@
 			if(B.current)
 				B.current.update_action_buttons_icon()
 				if(!B.current.incapacitated())
-					to_chat(B.current, "<span class='cultlarge'>[Nominee] could not win the cult's support and shall continue to serve as an acolyte.")
+					to_chat(B.current, "<span class='cultlarge'>[Nominee] could not win the cult's support and shall continue to serve as an acolyte.</span>")
 		return FALSE
 	GLOB.cult_mastered = TRUE
 	SSticker.mode.remove_cultist(Nominee.mind, TRUE)
@@ -144,7 +144,7 @@
 			for(var/datum/action/innate/cult/mastervote/vote in B.current.actions)
 				vote.Remove(B.current)
 			if(!B.current.incapacitated())
-				to_chat(B.current,"<span class='cultlarge'>[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!")
+				to_chat(B.current,"<span class='cultlarge'>[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!</span>")
 	return TRUE
 
 /datum/action/innate/cult/master/IsAvailable()

code/game/gamemodes/cult/ritual.dm

@@ -257,10 +257,8 @@ This file contains the arcane tome files.
 		to_chat(user, "<span class='cult'>There is already a rune here.</span>")
 		return FALSE
 
-
 	if(!(T.z in GLOB.station_z_levels) && T.z != ZLEVEL_MINING)
 		to_chat(user, "<span class='warning'>The veil is not weak enough here.</span>")
-
 		return FALSE
 
 	return TRUE

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -309,8 +309,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	owner_AI.nuking = TRUE
 	owner_AI.doomsday_device = DOOM
 	owner_AI.doomsday_device.start()
-	for(var/pinpointer in GLOB.pinpointer_list)
-		var/obj/item/pinpointer/P = pinpointer
+	for(var/obj/item/pinpointer/nuke/P in GLOB.pinpointer_list)
 		P.switch_mode_to(TRACK_MALF_AI) //Pinpointers start tracking the AI wherever it goes
 	qdel(src)
 
@@ -534,7 +533,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		if(!(AA.z in GLOB.station_z_levels))
 			continue
 		AA.emagged = TRUE
-	to_chat(owner, "<span class='notice'>All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.")
+	to_chat(owner, "<span class='notice'>All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.</span>")
 	owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0)
 
 

code/game/gamemodes/malfunction/Malf_Modules.dm.rej

@@ -0,0 +1,11 @@
+diff a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm	(rejected hunks)
+@@ -309,8 +309,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
+ 	owner_AI.nuking = TRUE
+ 	owner_AI.doomsday_device = DOOM
+ 	owner_AI.doomsday_device.start()
+-	for(var/pinpointer in GLOB.pinpointer_list)
+-		var/obj/item/weapon/pinpointer/P = pinpointer
++	for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
+ 		P.switch_mode_to(TRACK_MALF_AI) //Pinpointers start tracking the AI wherever it goes
+ 	qdel(src)
+ 

code/game/gamemodes/miniantags/abduction/machinery/experiment.dm

@@ -12,6 +12,8 @@
 	var/list/abductee_minds
 	var/flash = " - || - "
 	var/obj/machinery/abductor/console/console
+	var/message_cooldown = 0
+	var/breakout_time = 0.75
 
 /obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user)
 	if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target))
@@ -40,25 +42,23 @@
 /obj/machinery/abductor/experiment/relaymove(mob/user)
 	if(user.stat != CONSCIOUS)
 		return
-	container_resist(user)
+	if(message_cooldown <= world.time)
+		message_cooldown = world.time + 50
+		to_chat(user, "<span class='warning'>[src]'s door won't budge!</span>")
 
 /obj/machinery/abductor/experiment/container_resist(mob/living/user)
-	var/breakout_time = 600
 	user.changeNext_move(CLICK_CD_BREAKOUT)
 	user.last_special = world.time + CLICK_CD_BREAKOUT
-	to_chat(user, "<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about a minute.)</span>")
-	user.visible_message("<span class='italics'>You hear a metallic creaking from [src]!</span>")
-
-	if(do_after(user,(breakout_time), target = src))
+	user.visible_message("<span class='notice'>You see [user] kicking against the door of [src]!</span>", \
+		"<span class='notice'>You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)</span>", \
+		"<span class='italics'>You hear a metallic creaking from [src].</span>")
+	if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
 		if(!user || user.stat != CONSCIOUS || user.loc != src || state_open)
 			return
-
-		visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>")
-		to_chat(user, "<span class='notice'>You successfully break out of [src]!</span>")
-
+		user.visible_message("<span class='warning'>[user] successfully broke out of [src]!</span>", \
+			"<span class='notice'>You successfully break out of [src]!</span>")
 		open_machine()
 
-
 /obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H)
 	var/icon/photo = null
 	var/g = (H.gender == FEMALE) ? "f" : "m"

code/game/gamemodes/miniantags/monkey/monkey.dm

@@ -46,7 +46,7 @@
 
 
 /datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier)
-	to_chat(carrier.current, "<B><span class='notice'>You are the Jungle Fever patient zero!!</B>")
+	to_chat(carrier.current, "<B><span class='notice'>You are the Jungle Fever patient zero!!</B></span>")
 	to_chat(carrier.current, "<b>You have been planted onto this station by the Animal Rights Consortium.</b>")
 	to_chat(carrier.current, "<b>Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.</b>")
 	to_chat(carrier.current, "<b>While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.</b>")

code/game/gamemodes/nuclear/nuclear.dm

@@ -325,7 +325,7 @@
 	gloves = /obj/item/clothing/gloves/combat
 	back = /obj/item/storage/backpack
 	ears = /obj/item/device/radio/headset/syndicate/alt
-	l_pocket = /obj/item/pinpointer/syndicate
+	l_pocket = /obj/item/pinpointer/nuke/syndicate
 	id = /obj/item/card/id/syndicate
 	belt = /obj/item/gun/ballistic/automatic/pistol
 	backpack_contents = list(/obj/item/storage/box/syndie=1)

code/game/gamemodes/nuclear/nuclear.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm	(rejected hunks)
+@@ -325,7 +325,7 @@
+ 	gloves = /obj/item/clothing/gloves/combat
+ 	back = /obj/item/weapon/storage/backpack
+ 	ears = /obj/item/device/radio/headset/syndicate/alt
+-	l_pocket = /obj/item/weapon/pinpointer/syndicate
++	l_pocket = /obj/item/weapon/pinpointer/nuke/syndicate
+ 	id = /obj/item/weapon/card/id/syndicate
+ 	belt = /obj/item/weapon/gun/ballistic/automatic/pistol
+ 	backpack_contents = list(/obj/item/weapon/storage/box/syndie=1)

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -362,9 +362,9 @@
 	if(safety)
 		if(timing)
 			set_security_level(previous_level)
-			for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list)
+			for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
 				S.switch_mode_to(initial(S.mode))
-				S.nuke_warning = FALSE
+				S.alert = FALSE
 		timing = FALSE
 		bomb_set = TRUE
 		detonation_timer = null
@@ -381,16 +381,16 @@
 		bomb_set = TRUE
 		set_security_level("delta")
 		detonation_timer = world.time + (timer_set * 10)
-		for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list)
+		for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
 			S.switch_mode_to(TRACK_INFILTRATOR)
 		countdown.start()
 	else
 		bomb_set = FALSE
 		detonation_timer = null
 		set_security_level(previous_level)
-		for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list)
+		for(var/obj/item/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
 			S.switch_mode_to(initial(S.mode))
-			S.nuke_warning = FALSE
+			S.alert = FALSE
 		countdown.stop()
 	update_icon()
 

code/game/gamemodes/nuclear/nuclearbomb.dm.rej

@@ -0,0 +1,33 @@
+diff a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm	(rejected hunks)
+@@ -362,9 +362,9 @@
+ 	if(safety)
+ 		if(timing)
+ 			set_security_level(previous_level)
+-			for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
++			for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
+ 				S.switch_mode_to(initial(S.mode))
+-				S.nuke_warning = FALSE
++				S.alert = FALSE
+ 		timing = FALSE
+ 		bomb_set = TRUE
+ 		detonation_timer = null
+@@ -381,16 +381,16 @@
+ 		bomb_set = TRUE
+ 		set_security_level("delta")
+ 		detonation_timer = world.time + (timer_set * 10)
+-		for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
++		for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
+ 			S.switch_mode_to(TRACK_INFILTRATOR)
+ 		countdown.start()
+ 	else
+ 		bomb_set = FALSE
+ 		detonation_timer = null
+ 		set_security_level(previous_level)
+-		for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
++		for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
+ 			S.switch_mode_to(initial(S.mode))
+-			S.nuke_warning = FALSE
++			S.alert = FALSE
+ 		countdown.stop()
+ 	update_icon()
+ 

code/game/gamemodes/nuclear/pinpointer.dm

@@ -1,56 +1,7 @@
-//Pinpointers are used to track atoms from a distance as long as they're on the same z-level. The captain and nuke ops have ones that track the nuclear authentication disk.
-/obj/item/pinpointer
-	name = "pinpointer"
-	desc = "A handheld tracking device that locks onto certain signals."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "pinoff"
-	flags_1 = CONDUCT_1
-	slot_flags = SLOT_BELT
-	w_class = WEIGHT_CLASS_SMALL
-	item_state = "electronic"
-	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	throw_speed = 3
-	throw_range = 7
-	materials = list(MAT_METAL = 500, MAT_GLASS = 250)
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-	var/active = FALSE
-	var/atom/movable/target = null //The thing we're searching for
-	var/atom/movable/constant_target = null //The thing we're always focused on, if we're in the right mode
-	var/target_x = 0 //The target coordinates if we're tracking those
-	var/target_y = 0
-	var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination
-	var/nuke_warning = FALSE // If we've set off a miniature alarm about an armed nuke
-	var/mode = TRACK_NUKE_DISK //What are we looking for?
+/obj/item/pinpointer/nuke
+	var/mode = TRACK_NUKE_DISK
 
-/obj/item/pinpointer/New()
-	..()
-	GLOB.pinpointer_list += src
-
-/obj/item/pinpointer/Destroy()
-	STOP_PROCESSING(SSfastprocess, src)
-	GLOB.pinpointer_list -= src
-	return ..()
-
-/obj/item/pinpointer/attack_self(mob/living/user)
-	active = !active
-	user.visible_message("<span class='notice'>[user] [active ? "" : "de"]activates their pinpointer.</span>", "<span class='notice'>You [active ? "" : "de"]activate your pinpointer.</span>")
-	playsound(user, 'sound/items/screwdriver2.ogg', 50, 1)
-	icon_state = "pin[active ? "onnull" : "off"]"
-	if(active)
-		START_PROCESSING(SSfastprocess, src)
-	else
-		target = null //Restarting the pinpointer forces a target reset
-		STOP_PROCESSING(SSfastprocess, src)
-
-/obj/item/pinpointer/attackby(obj/item/I, mob/living/user, params)
-	if(mode != TRACK_ATOM)
-		return ..()
-	user.visible_message("<span class='notice'>[user] tunes [src] to [I].</span>", "<span class='notice'>You fine-tune [src]'s tracking to track [I].</span>")
-	playsound(src, 'sound/machines/click.ogg', 50, 1)
-	constant_target = I
-
-/obj/item/pinpointer/examine(mob/user)
+/obj/item/pinpointer/nuke/examine(mob/user)
 	..()
 	var/msg = "Its tracking indicator reads "
 	switch(mode)
@@ -60,12 +11,6 @@
 			msg += "\"01000001 01001001\"."
 		if(TRACK_INFILTRATOR)
 			msg += "\"vasvygengbefuvc\"."
-		if(TRACK_OPERATIVES)
-			msg += "\"[target ? "Operative [target]" : "friends"]\"."
-		if(TRACK_ATOM)
-			msg += "\"[initial(constant_target.name)]\"."
-		if(TRACK_COORDINATES)
-			msg += "\"([target_x], [target_y])\"."
 		else
 			msg = "Its tracking indicator is blank."
 	to_chat(user, msg)
@@ -73,22 +18,20 @@
 		if(bomb.timing)
 			to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]")
 
-/obj/item/pinpointer/process()
-	if(!active)
-		STOP_PROCESSING(SSfastprocess, src)
-		return
-	scan_for_target()
-	point_to_target()
-	my_god_jc_a_bomb()
-	addtimer(CALLBACK(src, .proc/refresh_target), 50, TIMER_UNIQUE)
+/obj/item/pinpointer/nuke/process()
+	..()
+	if(active) // If shit's going down
+		for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list)
+			if(bomb.timing)
+				if(!alert)
+					alert = TRUE
+					playsound(src, 'sound/items/nuke_toy_lowpower.ogg', 50, 0)
+					if(isliving(loc))
+						var/mob/living/L = loc
+						to_chat(L, "<span class='userdanger'>Your [name] vibrates and lets out a tinny alarm. Uh oh.</span>")
 
-/obj/item/pinpointer/proc/scan_for_target() //Looks for whatever it's tracking
-	if(target)
-		if(isliving(target))
-			var/mob/living/L = target
-			if(L.stat == DEAD)
-				target = null
-		return
+/obj/item/pinpointer/nuke/scan_for_target()
+	target = null
 	switch(mode)
 		if(TRACK_NUKE_DISK)
 			var/obj/item/disk/nuclear/N = locate() in GLOB.poi_list
@@ -104,76 +47,36 @@
 					target = A
 		if(TRACK_INFILTRATOR)
 			target = SSshuttle.getShuttle("syndicate")
-		if(TRACK_OPERATIVES)
-			var/list/possible_targets = list()
-			var/turf/here = get_turf(src)
-			for(var/V in SSticker.mode.syndicates)
-				var/datum/mind/M = V
-				if(M.current && M.current.stat != DEAD)
-					possible_targets |= M.current
-			var/mob/living/closest_operative = get_closest_atom(/mob/living/carbon/human, possible_targets, here)
-			if(closest_operative)
-				target = closest_operative
-		if(TRACK_ATOM)
-			if(constant_target)
-				target = constant_target
-		if(TRACK_COORDINATES)
-			var/turf/T = get_turf(src)
-			target = locate(target_x, target_y, T.z)
+	..()
 
-/obj/item/pinpointer/proc/point_to_target() //If we found what we're looking for, show the distance and direction
-	if(!active)
-		return
-	if(!target || (mode == TRACK_ATOM && !constant_target))
-		icon_state = "pinon[nuke_warning ? "alert" : ""]null"
-		return
-	var/turf/here = get_turf(src)
-	var/turf/there = get_turf(target)
-	if(here.z != there.z)
-		icon_state = "pinon[nuke_warning ? "alert" : ""]null"
-		return
-	if(get_dist_euclidian(here,there)<=minimum_range)
-		icon_state = "pinon[nuke_warning ? "alert" : ""]direct"
-	else
-		setDir(get_dir(here, there))
-		switch(get_dist(here, there))
-			if(1 to 8)
-				icon_state = "pinon[nuke_warning ? "alert" : "close"]"
-			if(9 to 16)
-				icon_state = "pinon[nuke_warning ? "alert" : "medium"]"
-			if(16 to INFINITY)
-				icon_state = "pinon[nuke_warning ? "alert" : "far"]"
-
-/obj/item/pinpointer/proc/my_god_jc_a_bomb() //If we should get the hell back to the ship
-	for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list)
-		if(bomb.timing)
-			if(!nuke_warning)
-				nuke_warning = TRUE
-				playsound(src, 'sound/items/nuke_toy_lowpower.ogg', 50, 0)
-				if(isliving(loc))
-					var/mob/living/L = loc
-					to_chat(L, "<span class='userdanger'>Your [name] vibrates and lets out a tinny alarm. Uh oh.</span>")
-
-/obj/item/pinpointer/proc/switch_mode_to(new_mode) //If we shouldn't be tracking what we are
+/obj/item/pinpointer/nuke/proc/switch_mode_to(new_mode)
 	if(isliving(loc))
 		var/mob/living/L = loc
 		to_chat(L, "<span class='userdanger'>Your [name] beeps as it reconfigures its tracking algorithms.</span>")
 		playsound(L, 'sound/machines/triple_beep.ogg', 50, 1)
 	mode = new_mode
-	target = null //Switch modes so we can find the new target
+	scan_for_target()
 
-/obj/item/pinpointer/proc/refresh_target() //Periodically removes the target to allow the pinpointer to update (i.e. malf AI shunts, an operative dies)
-	target = null
-
-/obj/item/pinpointer/syndicate //Syndicate pinpointers automatically point towards the infiltrator once the nuke is active.
+/obj/item/pinpointer/nuke/syndicate // Syndicate pinpointers automatically point towards the infiltrator once the nuke is active.
 	name = "syndicate pinpointer"
 	desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device."
+	icon_state = "pinpointer_syndicate"
 
-/obj/item/pinpointer/syndicate/cyborg //Cyborg pinpointers just look for a random operative.
+/obj/item/pinpointer/syndicate_cyborg // Cyborg pinpointers just look for a random operative.
 	name = "cyborg syndicate pinpointer"
 	desc = "An integrated tracking device, jury-rigged to search for living Syndicate operatives."
-	mode = TRACK_OPERATIVES
 	flags_1 = NODROP_1
 
-
+/obj/item/pinpointer/syndicate_cyborg/scan_for_target()
+	target = null
+	var/list/possible_targets = list()
+	var/turf/here = get_turf(src)
+	for(var/V in SSticker.mode.syndicates)
+		var/datum/mind/M = V
+		if(M.current && M.current.stat != DEAD)
+			possible_targets |= M.current
+	var/mob/living/closest_operative = get_closest_atom(/mob/living/carbon/human, possible_targets, here)
+	if(closest_operative)
+		target = closest_operative
+	..()
 

code/game/gamemodes/nuclear/pinpointer.dm.rej

@@ -0,0 +1,21 @@
+diff a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm	(rejected hunks)
+@@ -30,7 +30,6 @@
+ 						var/mob/living/L = loc
+ 						to_chat(L, "<span class='userdanger'>Your [name] vibrates and lets out a tinny alarm. Uh oh.</span>")
+ 
+-
+ /obj/item/pinpointer/nuke/scan_for_target()
+ 	target = null
+ 	switch(mode)
+@@ -58,10 +57,10 @@
+ 	mode = new_mode
+ 	scan_for_target()
+ 
+-
+ /obj/item/pinpointer/nuke/syndicate // Syndicate pinpointers automatically point towards the infiltrator once the nuke is active.
+ 	name = "syndicate pinpointer"
+ 	desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device."
++	icon_state = "pinpointer_syndicate"
+ 
+ /obj/item/pinpointer/syndicate_cyborg // Cyborg pinpointers just look for a random operative.
+ 	name = "cyborg syndicate pinpointer"

code/game/gamemodes/objective_items.dm

@@ -186,7 +186,7 @@
 	return ..()
 
 //Old ninja objectives.
-/datum/objective_item/special/pinpointer
+/datum/objective_item/special/pinpointer/nuke
 	name = "the captain's pinpointer."
 	targetitem = /obj/item/pinpointer
 	difficulty = 10

code/game/gamemodes/objective_items.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm	(rejected hunks)
+@@ -158,7 +158,7 @@
+ 	difficulty = 10
+ 
+ //Old ninja objectives.
+-/datum/objective_item/special/pinpointer
++/datum/objective_item/special/pinpointer/nuke
+ 	name = "the captain's pinpointer."
+ 	targetitem = /obj/item/pinpointer
+ 	difficulty = 10