From 1e322fcfb4af0ea3bd4334bc29b0e465a17010b6 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 27 Sep 2020 14:11:35 +0200 Subject: [PATCH] Immersive Vine Gameplay (#10052) Added sounds and an animation to hitting space vines. Sharp or edged items now deal double damage against vines, which makes high damage weapons better for vine clearing. Attacking plants no longer produces a visible message. --- code/modules/hydroponics/spreading/spreading.dm | 10 ++++++---- html/changelogs/geeves-reactive_vine_spam.yml | 8 ++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/geeves-reactive_vine_spam.yml diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index fab4cc20f1d..539f0c7b6f1 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -238,8 +238,8 @@ return 1 /obj/effect/plant/attackby(var/obj/item/W, var/mob/user) - user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + user.do_attack_animation(src) SSplants.add_plant(src) if(W.iswirecutter() || istype(W, /obj/item/surgery/scalpel)) @@ -261,9 +261,11 @@ health -= (rand(3,5)*5) sampled = 1 else - ..() - if(W.force) - health -= W.force + playsound(loc, /decl/sound_category/wood_break_sound, 50, TRUE) + var/damage = W.force ? W.force : 1 //always do at least a little damage + if(W.edge || W.sharp) + damage *= 2 + health -= damage check_health() /obj/effect/plant/ex_act(severity) diff --git a/html/changelogs/geeves-reactive_vine_spam.yml b/html/changelogs/geeves-reactive_vine_spam.yml new file mode 100644 index 00000000000..852b54b1c1c --- /dev/null +++ b/html/changelogs/geeves-reactive_vine_spam.yml @@ -0,0 +1,8 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added sounds and an animation to hitting space vines." + - tweak: "Sharp or edged items now deal double damage against vines, which makes high damage weapons better for vine clearing." + - tweak: "Attacking plants no longer produces a visible message." \ No newline at end of file