From 4309e7e112ae20c645357e7fd6b2f0038f4be275 Mon Sep 17 00:00:00 2001 From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com> Date: Thu, 15 Oct 2020 10:43:07 +0100 Subject: [PATCH 1/2] Fix blood from artifacts breaking the pathogenic isolator (#7705) Prevents blood not drawn from a humanmob (such as blood from artifact replenishing bowls or blood spawned in in reagent cartridges) from breaking the pathogenic isolator's interface. --- code/modules/virus2/isolator.dm | 2 +- html/changelogs/Meghan Rossi - isolator fix.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Meghan Rossi - isolator fix.yml diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index ff5e6dbcfe7..d4053e8e52b 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -73,7 +73,7 @@ var/mob/living/carbon/human/D = B.data["donor"] pathogen_pool.Add(list(list(\ - "name" = "[D.get_species()] [B.name]", \ + "name" = "[istype(D) ? "[D.get_species()] " : ""][B.name]", \ "dna" = B.data["blood_DNA"], \ "unique_id" = V.uniqueID, \ "reference" = "\ref[V]", \ diff --git a/html/changelogs/Meghan Rossi - isolator fix.yml b/html/changelogs/Meghan Rossi - isolator fix.yml new file mode 100644 index 00000000000..4801a458903 --- /dev/null +++ b/html/changelogs/Meghan Rossi - isolator fix.yml @@ -0,0 +1,4 @@ +author: Meghan-Rossi +delete-after: True +changes: + - bugfix: "Blood from artifacts will no longer break the pathogenic isolator." \ No newline at end of file