From 3166200c5eb986bf322cb1185b4dc4c5eedcc296 Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Tue, 16 Jun 2015 17:09:39 -0400 Subject: [PATCH] Diona Nymph runtime and Fruit Attack fixes Fixes a runtime preventing Diona Nymphs from eating weeds and regaining nutrition Fixes fruit attacks checking for "hurt" when they should check for "harm". - You can now smack people with fruit on harm intent. If the plant has TRAIT_STINGS, it will inject them with it's chemicals - You can now crush a fruit in your hand on harm intent to destroy it (will not leave trash like banana peels!). This will trigger the same effects that throwing the fruit would have, except without needing to throw it. - Use this to activate that smoke-screen tobacco you spent all round mutating, or to make a quick escape with your bluespace tomato! --- code/modules/hydroponics/grown.dm | 4 ++-- code/modules/mob/living/carbon/primitive/dionaold.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 7489f6391fb..c2fcb54de8c 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -284,7 +284,7 @@ if(user == M) return ..() - if(user.a_intent == "hurt") + if(user.a_intent == "harm") // This is being copypasted here because reagent_containers (WHY DOES FOOD DESCEND FROM THAT) overrides it completely. // TODO: refactor all food paths to be less horrible and difficult to work with in this respect. ~Z @@ -349,7 +349,7 @@ if(istype(user.loc,/turf/space)) return - if(user.a_intent == "hurt") + if(user.a_intent == "harm") user.visible_message("\The [user] squashes \the [src]!") seed.thrown_at(src,user) sleep(-1) diff --git a/code/modules/mob/living/carbon/primitive/dionaold.dm b/code/modules/mob/living/carbon/primitive/dionaold.dm index 030b7fcc1ae..47f9ce3981f 100644 --- a/code/modules/mob/living/carbon/primitive/dionaold.dm +++ b/code/modules/mob/living/carbon/primitive/dionaold.dm @@ -146,7 +146,7 @@ if(!src || !target || target.weedlevel == 0) return //Sanity check. - src.reagents.add_reagent("nutriment", target.weedlevel) + src.nutrition += target.weedlevel * 15 target.weedlevel = 0 src.visible_message("\red [src] begins rooting through [target], ripping out weeds and eating them noisily.","\red You begin rooting through [target], ripping out weeds and eating them noisily.")