From 9aca1194d7536c23ac751dd00f64e795ada2144b Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 10 Feb 2020 14:53:17 +0200 Subject: [PATCH] Fixes nymph blood sucking (#8236) --- .../mob/living/carbon/alien/diona/diona_powers.dm | 11 ++++++----- html/changelogs/geeves-nymph_fix.yml | 6 ++++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/geeves-nymph_fix.yml diff --git a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm index 87b4e6d5269..1150fe6df64 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm @@ -173,17 +173,18 @@ //For fun factor, we'll allow the nymph to choose nonvalid targets var/list/choices = list() for(var/mob/living/L in view(1, src)) - if(!Adjacent(L) || L == src) + if(L == src) continue - if(is_diona(L)) + if(!Adjacent(L)) + continue + if(L.is_diona()) continue choices += L - if(!choices.len) + if(!length(choices)) to_chat(src, span("warning", "There are no life forms nearby to sample!")) return - - if(choices.len) + else choices += "Cancel" var/mob/living/donor = input(src, "Who do you wish to sample?") in null|choices diff --git a/html/changelogs/geeves-nymph_fix.yml b/html/changelogs/geeves-nymph_fix.yml new file mode 100644 index 00000000000..78ef29c5d09 --- /dev/null +++ b/html/changelogs/geeves-nymph_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixes nymphs being unable to suck blood." \ No newline at end of file