Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

code/__HELPERS/atom_pool.dm

@@ -34,15 +34,12 @@ var/global/list/GlobalPool = list()
 	if(!AM)
 		if(ispath(get_type))
 			if(islist(second_arg))
-				AM = new get_type (arglist(second_arg))
+				return new get_type (arglist(second_arg))
 			else
-				AM = new get_type (second_arg)
-	else
-	if(AM)
+				return new get_type (second_arg)
 	return AM
 
 
-
 /proc/GetFromPool(var/get_type,var/second_arg)
 	if(!get_type)
 		return 0

code/game/objects/structures/mirror.dm

@@ -80,6 +80,7 @@
 				var/mob/living/carbon/human/vox/vox = new(get_turf(src),"Vox")
 				vox.gender = user.gender
 				raiders.equip(vox)
+				new /obj/item/organ/stack/vox(vox)
 				if(user.mind)
 					user.mind.transfer_to(vox)
 				spawn(1)

code/modules/mob/living/carbon/human/species/outsider/vox.dm

@@ -30,7 +30,7 @@
 	poison_type = "oxygen"
 	siemens_coefficient = 0.2
 
-	flags = IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
+	flags = CAN_JOIN | IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
 
 	blood_color = "#2299FC"
 	flesh_color = "#808D11"
@@ -47,8 +47,7 @@
 		"liver" =    /obj/item/organ/liver,
 		"kidneys" =  /obj/item/organ/kidneys,
 		"brain" =    /obj/item/organ/brain,
-		"eyes" =     /obj/item/organ/eyes,
-		"stack" =    /obj/item/organ/stack/vox
+		"eyes" =     /obj/item/organ/eyes
 		)
 
 /datum/species/vox/get_random_name(var/gender)

code/modules/nano/modules/alarm_monitor.dm

@@ -85,7 +85,7 @@
 					"origin_lost" = A.origin == null,
 					"has_cameras" = cameras.len,
 					"cameras" = cameras,
-					"lost_sources" = sanitize(english_list(lost_sources, nothing_text = "", and_text = ", "))))
+					"lost_sources" = lost_sources.len ? sanitize(english_list(lost_sources, nothing_text = "", and_text = ", ")) : ""))
 	data["categories"] = categories
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)