+50 −0

other.json

data/json/items/comestibles/other.json

+11 −11

activity_handlers.cpp

src/activity_handlers.cpp

+5 −0

calendar.cpp

src/calendar.cpp

+1 −0

calendar.h

src/calendar.h

+52 −44

character.cpp

src/character.cpp

+9 −12

character.h

src/character.h

+2 −2

construction.cpp

src/construction.cpp

+28 −70

consumption.cpp

src/consumption.cpp

+3 −3

debug_menu.cpp

src/debug_menu.cpp

+19 −7

game.cpp

src/game.cpp

+5 −4

iexamine.cpp

src/iexamine.cpp

+22 −13

iuse.cpp

src/iuse.cpp

+2 −8

iuse_actor.cpp

src/iuse_actor.cpp

+3 −2

mutation.cpp

src/mutation.cpp

+1 −1

mutation_ui.cpp

src/mutation_ui.cpp

+169 −99

player.cpp

src/player.cpp

+15 −3

player.h

src/player.h

+3 −9

player_display.cpp

src/player_display.cpp

+4 −2

player_hardcoded_effects.cpp

src/player_hardcoded_effects.cpp

+8 −7

savegame_json.cpp

src/savegame_json.cpp

+419 −0

stomach.cpp

src/stomach.cpp

+146 −0

stomach.h

src/stomach.h

+1 −1

vehicle.cpp

src/vehicle.cpp

+287 −0

stomach_contents_tests.cpp

tests/stomach_contents_tests.cpp