From 20ec46b0ca2d86d51486f640a121b0b663ad5c34 Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:26:27 +0100 Subject: [PATCH] At least this was caught now (#23563) --- code/modules/paperwork/pen.dm | 4 ++-- code/modules/projectiles/projectile/bullets.dm | 6 +++--- code/modules/reagents/reagent_containers/hypospray.dm | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 44c94fc76bb..83def2f64a9 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -132,8 +132,8 @@ add_attack_logs(user, M, "Stabbed with (sleepy) [src]. [transfered]u of reagents transfered from pen containing [english_list(contained)].") for(var/datum/reagent/R as anything in reagents.reagent_list) if(initial(R.id) == "????") // Yes this is a specific case that we don't really want - return TRUE - reagents.reaction(M, REAGENT_INGEST, 0.1) + continue + reagents.reaction(M, REAGENT_INGEST, 0.1) return TRUE diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 264ac7f9de8..b81b6a5690e 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -264,12 +264,12 @@ if(blocked != INFINITY) if(M.can_inject(null, FALSE, hit_zone, piercing)) // Pass the hit zone to see if it can inject by whether it hit the head or the body. ..() + for(var/datum/reagent/R as anything in reagents.reagent_list) if(initial(R.id) == "????") // Yes this is a specific case that we don't really want - reagents.trans_to(M, reagents.total_volume) - return TRUE + continue + reagents.reaction(M, REAGENT_INGEST, 0.1) reagents.trans_to(M, reagents.total_volume) - reagents.reaction(M, REAGENT_INGEST, 0.1) return TRUE else blocked = INFINITY diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 72996bda5f3..32ac08eaf6d 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -53,8 +53,8 @@ add_attack_logs(user, M, "Injected with [src] containing ([contained])", reagents.harmless_helper() ? ATKLOG_ALMOSTALL : null) for(var/datum/reagent/R as anything in reagents.reagent_list) if(initial(R.id) == "????") // Yes this is a specific case that we don't really want - return TRUE - reagents.reaction(M, REAGENT_INGEST, 0.1) + continue + reagents.reaction(M, REAGENT_INGEST, 0.1) return TRUE /obj/item/reagent_containers/hypospray/attack(mob/living/M, mob/user)