Merge branch 'develop' of https://github.com/DFHack/dfhack into develop

develop
Japa 2015-11-03 18:50:00 +05:30
commit 3fd4b01829
2 changed files with 3 additions and 3 deletions

@ -149,7 +149,7 @@ const string zone_help_filters =
" caged - in a built cage\n"
" own - from own civilization\n"
" war - trained war creature\n"
" tamed - tamed\n"
" tame - tamed\n"
" named - has name or nickname\n"
" can be used to mark named units for slaughter\n"
" merchant - is a merchant / belongs to a merchant\n"

@ -32,7 +32,7 @@ orientation filters:
-notStraight
shows only creatures who are not strictly straight
-gayOnly
shows only creatures who are strictly gayOnly
shows only creatures who are strictly gay
-biOnly
shows only creatures who can get into romances with
both sexes