Merge pull request #1376 from CHOMPStationBot/upstream-merge-9764

[MIRROR] [MIRROR] Couple of small fixes.
This commit is contained in:
Nadyr
2021-02-28 07:16:38 -05:00
committed by GitHub
2 changed files with 4 additions and 5 deletions
-3
View File
@@ -4721,9 +4721,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
+4 -2
View File
@@ -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, "<span class='danger'>You are stung by \the [fruit]!</span>")
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)