From 4770d6086cd5a661115680de3859b3d0775c0eda Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 14 Mar 2021 14:04:26 +0200 Subject: [PATCH] Multi-Borer Fix (#11422) --- .../mob/living/simple_animal/borer/borer_powers.dm | 8 ++++++-- html/changelogs/geeves-me_brain_wurm.yml | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-me_brain_wurm.yml diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index 938ac67432b..ebb3e3cbaad 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -73,8 +73,12 @@ if(!E || E.is_stump()) to_chat(src, SPAN_WARNING("\The [H] does not have a head!")) return - if(!H.species.has_organ[BP_BRAIN]) - to_chat(src, SPAN_WARNING("\The [H] does not seem to have an ear canal to breach.")) + var/obj/item/organ/internal/I = H.species.has_organ[BP_BRAIN] + if(!I) + to_chat(src, SPAN_WARNING("\The [H] doesn't have a brain!")) + return + if(istype(I, /obj/item/organ/internal/borer)) + to_chat(src, SPAN_WARNING("You cannot infest someone who is already infested!")) return if(H.isSynthetic()) to_chat(src, SPAN_NOTICE("You can't affect synthetics.")) diff --git a/html/changelogs/geeves-me_brain_wurm.yml b/html/changelogs/geeves-me_brain_wurm.yml new file mode 100644 index 00000000000..004da299dbe --- /dev/null +++ b/html/changelogs/geeves-me_brain_wurm.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Multiple borers can no longer infect the same host." \ No newline at end of file