diff --git a/code/__HELPERS/atom_pool.dm b/code/__HELPERS/atom_pool.dm index d5978592c2..77a7caf5e4 100644 --- a/code/__HELPERS/atom_pool.dm +++ b/code/__HELPERS/atom_pool.dm @@ -34,13 +34,10 @@ 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 AM - + return new get_type (second_arg) + return AM /proc/GetFromPool(var/get_type,var/second_arg) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index dc18b06e6c..f0a5b9003a 100644 --- a/code/game/objects/structures/mirror.dm +++ b/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) diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index c037d81fb7..62ba2e49e8 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/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) diff --git a/code/modules/nano/modules/alarm_monitor.dm b/code/modules/nano/modules/alarm_monitor.dm index 9047023bf1..b27349bf9a 100644 --- a/code/modules/nano/modules/alarm_monitor.dm +++ b/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)