Merge branch 'master' into mirceakitsune/consumable_items

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index b6c6cfe8528c9239390ce572a5f76063410cfe82..617d5f01aa50f182c85cd01873f077b90315ed65 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -280,6 +280,8 @@ Features:
 \r
 - Dead predators can keep their prey until they respawn, as long as they aren't gibbed. Prey needs to kick as usual to get out of a dead predator, or wait for them to respawn.\r
 \r
+- Picking up health items no longer increases your health immediately. Health is now eaten and digested like players, and increase stomach load while carried. Players inside the stomach will also be able to see the food inside. Health items can also be thrown up at their existing consumption and eaten by other players, as unpleasant as the thought might sound to some :)\r
+\r
 - Helper system. A voice will talk in the background when the player is in a dangerous situation (similar to the suit in Half Life, which warns you when you're low on health).\r
 \r
 - Bootable subsystems. The crosshair, HUD, and helper voice will take 2 seconds to startup when the player spawns. Also, if armor (now considered charge) is below 5, you will not have enough energy to run your subsystems, and must wait for your armor to recharge.\r