Merge remote-tracking branch 'polaris/master' into sink

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

code/modules/admin/admin_verbs.dm

@@ -184,6 +184,7 @@ var/list/admin_verbs_debug = list(
 	/client/proc/overlay_random_map,
 	/client/proc/delete_random_map,
 	/client/proc/show_plant_genes,
+	/client/proc/show_xenobio_genes,
 	/client/proc/enable_debug_verbs,
 	/client/proc/callproc,
 	/client/proc/callproc_target,

code/modules/admin/verbs/randomverbs.dm

@@ -234,9 +234,9 @@ Ccomp's first proc.
 
 	var/list/mobs = list()
 	var/list/ghosts = list()
-	var/list/sortmob = sortAtom(mob_list)                           // get the mob list.
+	var/list/sortmob = sortAtom(mob_list)                           // get the mob list.
 	var/any=0
-	for(var/mob/observer/dead/M in sortmob)
+	for(var/mob/observer/dead/M in sortmob)
 		mobs.Add(M)                                             //filter it where it's only ghosts
 		any = 1                                                 //if no ghosts show up, any will just be 0
 	if(!any)
@@ -388,7 +388,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	else
 		new_character.gender = pick(MALE,FEMALE)
 		var/datum/preferences/A = new()
-		A.randomize_appearance_for(new_character)
+		A.randomize_appearance_and_body_for(new_character)
 		new_character.real_name = G_found.real_name
 
 	if(!new_character.real_name)