From 54977bec0f0e06af9ec745d62d3c045ec60ab708 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 14 Feb 2023 03:43:51 +0100 Subject: [PATCH] [MIRROR] Fixes runtime with mime kissing [MDB IGNORE] (#19332) * Fixes runtime with mime kissing (#73394) ## About The Pull Request Not all living mobs have a reagent datum, but you can kiss all living mobs. ## Changelog :cl: Melbert fix: Fixed a runtime from mime *kissing silicons and simplemobs. /:cl: * Fixes runtime with mime kissing --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/game/objects/items/hand_items.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index c02aaf6ba1b..d0b4c27c3d3 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -629,8 +629,10 @@ /obj/projectile/kiss/french/harmless_on_hit(mob/living/living_target) . = ..() + if(isnull(living_target.reagents)) + return //Don't stack the garlic - if(! living_target.has_reagent(/datum/reagent/consumable/garlic) ) + if(!living_target.has_reagent(/datum/reagent/consumable/garlic)) //Phwoar living_target.reagents.add_reagent(/datum/reagent/consumable/garlic, 1) living_target.visible_message("[living_target] has a funny look on [living_target.p_their()] face.", "Wow, that is a strong after taste of garlic!", vision_distance=COMBAT_MESSAGE_RANGE)