Merge branch 'master' of https://github.com/PolarisSS13/Polaris

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

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

@@ -80,7 +80,7 @@
 					flash_strength *= H.species.flash_mod
 				if(flash_strength > 0)
 					M.Weaken(flash_strength)
-					flick("e_flash", M.flash)
+					M.flash_eyes()
 			else
 				flashfail = 1
 
@@ -158,7 +158,7 @@
 		var/safety = M:eyecheck()
 		if(!safety)
 			if(!M.blinded)
-				flick("flash", M.flash)
+				M.flash_eyes()
 
 	return
 
@@ -177,7 +177,7 @@
 				var/safety = M.eyecheck()
 				if(safety <= 0)
 					M.Weaken(10)
-					flick("e_flash", M.flash)
+					M.flash_eyes()
 					for(var/mob/O in viewers(M, null))
 						O.show_message("<span class='disarm'>[M] is blinded by the flash!</span>")
 	..()

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

@@ -79,9 +79,9 @@
 					user << "<span class='notice'>\The [M]'s pupils narrow slightly, but are still very dilated.</span>"
 				else
 					user << "<span class='notice'>\The [M]'s pupils narrow.</span>"
-			
+
 			user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) //can be used offensively
-			flick("flash", M.flash)
+			M.flash_eyes()
 	else
 		return ..()
 

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

@@ -24,8 +24,16 @@ REAGENT SCANNER
 	origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 1)
 	var/mode = 1;
 
+/obj/item/device/healthanalyzer/do_surgery(mob/living/M, mob/living/user)
+	if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
+		return ..()
+	scan_mob(M, user) //default surgery behaviour is just to scan as usual
+	return 1
 
-/obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
+/obj/item/device/healthanalyzer/attack(mob/living/M, mob/living/user)
+	scan_mob(M, user)
+
+/obj/item/device/healthanalyzer/proc/scan_mob(mob/living/M, mob/living/user)
 	if ((CLUMSY in user.mutations) && prob(50))
 		user << text("<span class='warning'>You try to analyze the floor's vitals!</span>")
 		for(var/mob/O in viewers(M, null))
@@ -168,8 +176,7 @@ REAGENT SCANNER
 			else
 				user.show_message("<span class='notice'>Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span>")
 		user.show_message("<span class='notice'>Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font></span>")
-	src.add_fingerprint(user)
-	return
+
 
 /obj/item/device/healthanalyzer/verb/toggle_mode()
 	set name = "Switch Verbosity"

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

@@ -6,6 +6,7 @@
 	var/list/nanoui_items				// List of items for NanoUI use
 	var/nanoui_menu = 0					// The current menu we are in
 	var/list/nanoui_data = new 			// Additional data for NanoUI use
+	var/faction = ""					//Antag faction holder.
 
 	var/list/purchase_log = new
 	var/datum/mind/uplink_owner = null
@@ -96,6 +97,9 @@
 	var/title = "Remote Uplink"
 	var/data[0]
 	uses = user.mind.tcrystals
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		faction = H.antag_faction
 
 	data["welcome"] = welcome
 	data["crystals"] = uses
@@ -188,7 +192,10 @@
 				nanoui_data["exploit"]["faction"] =  html_encode(L.fields["faction"])
 				nanoui_data["exploit"]["religion"] =  html_encode(L.fields["religion"])
 				nanoui_data["exploit"]["fingerprint"] =  html_encode(L.fields["fingerprint"])
-
+				if(L.fields["antagvis"] == ANTAG_KNOWN || (faction == L.fields["antagfac"] && (L.fields["antagvis"] == ANTAG_SHARED)))
+					nanoui_data["exploit"]["antagfaction"] = html_encode(L.fields["antagfac"])
+				else
+					nanoui_data["exploit"]["antagfaction"] = html_encode("None")
 				nanoui_data["exploit_exists"] = 1
 				break