Better handling of Freedoom stimpacks & medikits

Also reverted previous commit. Not working as intended.