Merge conflicts begone

code/modules/hydroponics/grown.dm

@@ -10,6 +10,7 @@
 	var/datum/seed/seed
 	var/potency = -1
 	var/awakening = 0
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/New(newloc,planttype)
 

code/modules/hydroponics/grown_inedible.dm

@@ -7,6 +7,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	var/plantname
 	var/potency = 1
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/grown/New(newloc,planttype)
 
@@ -170,8 +171,11 @@
 	to_chat(M, "<font color='green'>[user] smacks you with a [name]!</font><font color='yellow'><b>FLOWER POWER</b></font>")
 	to_chat(user, "<font color='green'> Your [name]'s </font><font color='yellow'><b>FLOWER POWER</b></font><font color='green'> strikes [M]</font>")
 	if(istype(M, /mob/living))
-		to_chat(M, "<span class='warning'>You are heated by the warmth of the of the [name]!</span>")
-		M.bodytemperature += potency/2 * TEMPERATURE_DAMAGE_COEFFICIENT
+		to_chat(M, "<span class='danger'>You are lit on fire from the intense heat of the [name]!</span>")
+		M.adjust_fire_stacks(potency / 20)
+		if(M.IgniteMob())
+			message_admins("[key_name_admin(user)] set [key_name_admin(M)] on fire")
+			log_game("[key_name(user)] set [key_name(M)] on fire")
 
 /obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob)
 	if(!user.gloves)

code/modules/hydroponics/seed_packets.dm

@@ -6,7 +6,7 @@ var/global/list/plant_seed_sprites = list()
 	icon = 'icons/obj/seeds.dmi'
 	icon_state = "blank"
 	w_class = 2
-
+	burn_state = FLAMMABLE
 	var/seed_type
 	var/datum/seed/seed
 	var/modified = 0