Merge pull request #12001 from PsiOmegaDelta/160117-PolarisDev

Fixes

code/game/antagonist/station/changeling.dm

@@ -54,3 +54,23 @@
 				survive_objective.owner = changeling
 				changeling.objectives += survive_objective
 	return
+
+/datum/antagonist/changeling/can_become_antag(var/datum/mind/player, var/ignore_role)
+	if(..())
+		if(player.current)
+			if(ishuman(player.current))
+				var/mob/living/carbon/human/H = player.current
+				if(H.isSynthetic())
+					return 0
+				if(H.species.flags & NO_SCAN)
+					return 0
+				return 1
+			else if(isnewplayer(player.current))
+				if(player.current.client && player.current.client.prefs)
+					var/datum/species/S = all_species[player.current.client.prefs.species]
+					if(S && (S.flags & NO_SCAN))
+						return 0
+					if(player.current.client.prefs.organ_data["torso"] == "cyborg") // Full synthetic.
+						return 0
+					return 1
+ 	return 0

code/modules/projectiles/guns/energy/laser.dm

@@ -7,9 +7,9 @@
 	slot_flags = SLOT_BELT|SLOT_BACK
 	w_class = 3
 	force = 10
-	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
-	matter = list(DEFAULT_WALL_MATERIAL = 2000)
-	projectile_type = /obj/item/projectile/beam/midlaser
+	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
+	matter = list(DEFAULT_WALL_MATERIAL = 2000)
+	projectile_type = /obj/item/projectile/beam/midlaser
 
 /obj/item/weapon/gun/energy/laser/mounted
 	self_recharge = 1
@@ -35,7 +35,7 @@ obj/item/weapon/gun/energy/retro
 	name = "antique laser gun"
 	icon_state = "caplaser"
 	item_state = "caplaser"
-	desc = "A rare weapon, handcrafted by a now defunct specialty manufacturer on Luna for a small fortune. It's certainly aged well"
+	desc = "A rare weapon, handcrafted by a now defunct specialty manufacturer on Luna for a small fortune. It's certainly aged well."
 	force = 5
 	fire_sound = 'sound/weapons/Laser.ogg'
 	slot_flags = SLOT_BELT