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

DFHack · Nov 3, 2015 · 3fd4b01 · 3fd4b01
2 parents f5ca3f9 + f7a5574
commit 3fd4b01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
@@ -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"

diff --git a/scripts/gaydar.lua b/scripts/gaydar.lua
@@ -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
@@ -187,4 +187,4 @@ else
  for k,v in ipairs(orientations) do
   print(v)
  end
-end
+end