From 51f870595eb4710f528e7a0af61d4e2021c295ef Mon Sep 17 00:00:00 2001 From: Marm <85680653+ItsMarmite@users.noreply.github.com> Date: Thu, 30 Jun 2022 19:00:29 +0100 Subject: [PATCH] Nerfs Deathnettle (#18128) * Nerfs Deathnettle (I hate plants) * Update nettle.dm Early returns are good apparently. * Stage of grief: fear Should fix errors? * Update code/modules/hydroponics/grown/nettle.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/modules/hydroponics/grown/nettle.dm | 27 ++++++++++-------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index b6cf7fd5ea1..76d5680804b 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -25,7 +25,7 @@ yield = 2 genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/stinging) mutatelist = list() - reagents_add = list("facid" = 0.5, "sacid" = 0.5) + reagents_add = list("facid" = 0.25, "sacid" = 0.25) rarity = 20 /obj/item/grown/nettle //abstract type @@ -37,7 +37,7 @@ force = 15 hitsound = 'sound/weapons/bladeslice.ogg' throwforce = 5 - w_class = WEIGHT_CLASS_TINY + w_class = WEIGHT_CLASS_NORMAL // Two nettle/deathnettle fit in a pneumatic cannon. They fit in plant bags. throw_speed = 1 throw_range = 3 origin_tech = "combat=3" @@ -81,20 +81,20 @@ /obj/item/grown/nettle/basic/add_juice() ..() - force = round((5 + seed.potency / 5), 1) + force = round((5 + seed.potency / 10), 1) // Maximum damage 15. /obj/item/grown/nettle/death seed = /obj/item/seeds/nettle/death name = "deathnettle" desc = "The glowing nettle incites rage in you just from looking at it!" icon_state = "deathnettle" - force = 30 - throwforce = 15 + force = 25 + throwforce = 10 origin_tech = "combat=5" /obj/item/grown/nettle/death/add_juice() ..() - force = round((5 + seed.potency / 2.5), 1) + force = round((5 + seed.potency / 5), 1) // Maximum damage 25. /obj/item/grown/nettle/death/pickup(mob/living/carbon/user) if(..()) @@ -104,14 +104,9 @@ /obj/item/grown/nettle/death/attack(mob/living/carbon/M, mob/user) ..() - if(isliving(M)) - to_chat(M, "You are stunned by the powerful acid of the Deathnettle!") - add_attack_logs(user, M, "Hit with [src]") + if(!isliving(M)) + return - M.AdjustEyeBlurry((force / 7) STATUS_EFFECT_CONSTANT) - if(prob(20)) - var/paralyze_time = (force * 10 / 3) SECONDS - var/stun_time = (force / 7.5) SECONDS - M.Paralyse(paralyze_time) - M.Weaken(stun_time) - M.drop_item() + to_chat(M, "You flinch as you are struck by \the [src]!") + add_attack_logs(user, M, "Hit with [src]") + M.AdjustEyeBlurry(force * 2) // Maximum duration 5 seconds per hit.