From 2082a52b2a7f4fef156238d603b120c1b2043534 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 20 Feb 2021 02:31:41 -0500 Subject: [PATCH 1/2] Merge pull request #9764 from VOREStation/upstream-merge-7899 [MIRROR] Couple of small fixes. --- code/modules/food/food/snacks.dm | 3 --- code/modules/hydroponics/seed.dm | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 93aedaee97..bf9d980fd7 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -4715,9 +4715,6 @@ /mob/living/simple_mob/adultslime composition_reagent = "slimejelly" -/mob/living/carbon/slime - composition_reagent = "slimejelly" - /mob/living/carbon/alien/diona composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 53a31a8a2b..9ceb81fd37 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -170,9 +170,11 @@ if(!body_coverage) return - if (fruit) + + var/obj/item/organ/external/E = target.get_organ(target.hand ? BP_L_HAND : BP_R_HAND) + if(istype(E) && E.robotic < ORGAN_ROBOT && fruit) var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5)) - to_chat(target, "You are stung by \the [fruit]!") + to_chat(target, SPAN_DANGER("You are stung by \the [fruit]!")) for(var/chem in chems) target.reagents.add_reagent(chem,injecting) if (fruit.reagents)