Merge branch 'master' into development

code/modules/projectiles/guns/projectile/automatic.dm

@@ -396,6 +396,9 @@
 	set category = "Object"
 	set src in usr
 
+	toggle_wield(usr)
+	usr.update_icon()
+
 /obj/item/weapon/gun/projectile/automatic/rifle/shotgun
 	name = "assault shotgun"
 	desc = "A experimental, semi-automatic combat shotgun, designed for boarding operations and law enforcement agencies."

code/modules/projectiles/projectile/change.dm

@@ -77,7 +77,7 @@
 				H.name += " [pick(last_names)]"
 				H.real_name = H.name
 
-				H.set_species(randomize)
+				addtimer(CALLBACK(H, /mob/living/carbon/human.proc/set_species, randomize), 0)
 				H.universal_speak = 1
 				var/datum/preferences/A = new() //Randomize appearance for the human
 				A.randomize_appearance_for(H)