Drug effect should be extended back to 30min while taking the same drug even if already under the effects. Why? Because it's simplier that way. It would be more player-friendly to be able to extend the effects back to maximum time at any moment. If we're in tight situation the player might not notice that his drugs have worn off due to too small message of it. The information of effects being over can simply disappear in the flood of combat messages.