Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nerfs Deathnettle #18128

Merged
merged 4 commits into from
Jun 30, 2022
Merged

Nerfs Deathnettle #18128

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48b423e
Nerfs Deathnettle (I hate plants)
ItsMarmite Jun 28, 2022
f43c3ca
Update nettle.dm
ItsMarmite Jun 29, 2022
a985f60
Stage of grief: fear
ItsMarmite Jun 29, 2022
54067c9
Update code/modules/hydroponics/grown/nettle.dm
ItsMarmite Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions code/modules/hydroponics/grown/nettle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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 <span class='danger'>glowing</span> nettle incites <span class='boldannounce'>rage</span> 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(..())
Expand All @@ -104,14 +104,9 @@

/obj/item/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
..()
if(isliving(M))
to_chat(M, "<span class='danger'>You are stunned by the powerful acid of the Deathnettle!</span>")
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, "<span class='danger'>You flinch as you are struck by \the [src]!</span>")
add_attack_logs(user, M, "Hit with [src]")
M.AdjustEyeBlurry(force * 2) // Maximum duration 5 seconds per hit.