From cc8a9254e4081090e48924aaf3e4e2388c88baac Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Wed, 22 Nov 2023 22:04:04 +0100 Subject: [PATCH] remove absorbed form virus lists -> Absorbed are ignored in greater and lesser virus selection -> Absorb can no longer ba event infected --- code/modules/gamemaster/event2/events/medical/virus.dm | 2 +- code/modules/virus2/admin.dm | 2 +- code/modules/virus2/disease2.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/gamemaster/event2/events/medical/virus.dm b/code/modules/gamemaster/event2/events/medical/virus.dm index 58791d2ad15..01769947f86 100644 --- a/code/modules/gamemaster/event2/events/medical/virus.dm +++ b/code/modules/gamemaster/event2/events/medical/virus.dm @@ -44,7 +44,7 @@ /datum/event2/event/virus/set_up() for(var/mob/living/carbon/human/H in player_list) - if(H.client && !H.isSynthetic() && H.stat != DEAD && !player_is_antag(H.mind)) + if(H.client && !H.isSynthetic() && H.stat != DEAD && !player_is_antag(H.mind) && !H.absorbed) candidates += H candidates = shuffle(candidates) diff --git a/code/modules/virus2/admin.dm b/code/modules/virus2/admin.dm index 30e673960c7..a798af4f8ab 100644 --- a/code/modules/virus2/admin.dm +++ b/code/modules/virus2/admin.dm @@ -178,7 +178,7 @@ if("infectee") var/list/candidates = list() for(var/mob/living/carbon/G in living_mob_list) - if(G.stat != DEAD && G.species) + if(G.stat != DEAD && G.species && !G.absorbed) if(G.species.get_bodytype() in species) candidates["[G.name][G.client ? "" : " (no client)"]"] = G else diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm index 0a89665a308..3a6f6e14d21 100644 --- a/code/modules/virus2/disease2.dm +++ b/code/modules/virus2/disease2.dm @@ -284,7 +284,7 @@ var/global/list/virusDB = list() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) - if(G.client && G.stat != DEAD) + if(G.client && G.stat != DEAD && !G.absorbed) candidates += G if(!candidates.len) return @@ -297,7 +297,7 @@ var/global/list/virusDB = list() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) - if(G.client && G.stat != DEAD) + if(G.client && G.stat != DEAD && !G.absorbed) candidates += G if(!candidates.len) return