From e4a0edb3093d732b8173ba05af6eaaecb12f5b48 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 10 Apr 2015 02:28:38 -0700 Subject: [PATCH 1/4] Readds CAN_JOIN to Vox for Ikky. --- code/modules/mob/living/carbon/human/species/outsider/vox.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ff99a53995..80a0fded1c 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" From d70ea77c2d168c97c9891b842ce2a2b2a6f32539 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 10 Apr 2015 02:35:04 -0700 Subject: [PATCH 2/4] Moved stack into heist antag creation for pariah reinclusion. --- code/game/gamemodes/heist/heist.dm | 3 ++- code/modules/mob/living/carbon/human/species/outsider/vox.dm | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 8157acc1a0..712b8ff247 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -114,7 +114,8 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' for(var/datum/organ/external/limb in vox.organs) limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT) - // Keep track of their stack. + // Add and keep track of their stack. + new /datum/organ/internal/stack/vox(vox) if(vox.internal_organs_by_name["stack"]) cortical_stacks |= vox.internal_organs_by_name["stack"] 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 80a0fded1c..aad904ae2a 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -47,8 +47,7 @@ "liver" = /datum/organ/internal/liver, "kidneys" = /datum/organ/internal/kidney, "brain" = /datum/organ/internal/brain, - "eyes" = /datum/organ/internal/eyes, - "stack" = /datum/organ/internal/stack/vox + "eyes" = /datum/organ/internal/eyes ) /datum/species/vox/get_random_name(var/gender) From 080b0178ab21522b05c576cb5a5c0118f6e03d74 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Fri, 10 Apr 2015 15:19:55 +0200 Subject: [PATCH 3/4] Fixes issue with the alarm monitor (only sometimes) listing a null missing alarm source. --- code/modules/nano/modules/alarm_monitor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 9181a2a43a7d0e35ba59b251b3ed2f50dbb78355 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 11 Apr 2015 10:28:15 +0200 Subject: [PATCH 4/4] Fixes atom pooling return code. --- code/__HELPERS/atom_pool.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/atom_pool.dm b/code/__HELPERS/atom_pool.dm index 72c8594211..77a7caf5e4 100644 --- a/code/__HELPERS/atom_pool.dm +++ b/code/__HELPERS/atom_pool.dm @@ -34,12 +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 - return AM - + return new get_type (second_arg) + return AM /proc/GetFromPool(var/get_type,var/second_arg)