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