Added shallow and deep salt water tiles. The goal is to eventually make so that swamps have a chance to have brackish/salty water. But I can't for the life of me figure out where in the code the swamp tiles are actually placed.
Thanks Bevad! So swamps now spawn with a mix of salt and freshwater tiles.
Remove reference to ssize_t in player_activity.cpp

This should now be the correct check. The index is used as parameter to the operator[] functions which expects a size_t value-
This conversion is done automatically, like "str_values[(size_t)index]". Therefor one has to check for "(size_t)index < size()".
Replace format %zu with %d in mk_artifact_id

This should work on all supported platforms, as the %d format is used all over the program.
Update recipes.json
s

t
t

s
Merge bugfixes.
Merge salt marshes.