Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet

Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi

code/modules/projectiles/projectile/beams.dm

@@ -30,6 +30,7 @@
 	icon_state = "xray"
 	damage = 15
 	irradiate = 30
+	range = 15
 	forcedodge = 1
 
 /obj/item/projectile/beam/disabler

code/modules/projectiles/projectile/magic.dm

@@ -227,9 +227,10 @@
 					ready_dna(H)
 					if(H.dna && prob(50))
 						var/list/all_species = list()
-						for(var/datum/species/S in typesof(/datum/species) - /datum/species)
+						for(var/speciestype in typesof(/datum/species) - /datum/species)
+							var/datum/species/S = new speciestype()
 							if(!S.dangerous_existence)
-								all_species += S
+								all_species += speciestype
 						hardset_dna(H, null, null, null, null, pick(all_species))
 					H.update_icons()
 				else