From b67643cc39d304c1a3dba702346e9bf3f03e7564 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:34:28 +0200 Subject: [PATCH] [MIRROR] nerfs the HP of bushes (#29291) * nerfs the HP of bushes (#85682) ## About The Pull Request - Lowered the HP of the "flora" type from 150 (same as reinforced window) to 100 - Trees are still 150 HP - Gave flora an x4 modifier to burn damage (takes 4 times the burn damage) ## Why It's Good For The Game Every time you do a project as an engineer on a map with bushes, each bush takes 10 welding tool hits to destroy, overall bushes have way too much HP and shouldn't be this difficult to destroy. ## Changelog :cl: grungussuss balance: bushes and other flora have had their HP reduced from 150 to 100. Trees still have 150 HP balance: flora now has an X4 modifier to damage from burn sources /:cl: * nerfs the HP of bushes --------- Co-authored-by: grungussuss <96586172+Sadboysuss@users.noreply.github.com> --- code/game/objects/structures/flora.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 49a230d6bdc..a464f418276 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -2,7 +2,7 @@ name = "flora" desc = "Some sort of plant." resistance_flags = FLAMMABLE - max_integrity = 150 + max_integrity = 100 anchored = TRUE drag_slowdown = 1.3 @@ -113,6 +113,12 @@ if(harvest(user)) after_harvest(user) +/obj/structure/flora/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) + if(damage_flag == MELEE) + if(damage_type == BURN) + damage_amount *= 4 + return ..() + /obj/structure/flora/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) var/use_default_sound = TRUE //Because I don't wanna do unnecessary bitflag checks in a single if statement, while also allowing for multiple sounds to be played if(flora_flags & FLORA_HERBAL) @@ -278,6 +284,7 @@ name = "tree" desc = "A large tree." density = TRUE + max_integrity = 150 pixel_x = -16 layer = FLY_LAYER plane = ABOVE_GAME_PLANE