Merge remote-tracking branch 'upstream/master' into SquidHack

Author: realSquidCoder

changelog.txt

@@ -26,6 +26,18 @@ Template for new versions:
 
 # Future
 
+## New Tools
+
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Removed
+
+# 52.03-r2
+
 ## New Tools
 - `autotraining`: new tool to assign citizens to a military squad when they need Martial Training
 - `gui/autotraining`: configuration tool for autotraining

husbandry.lua

@@ -116,7 +116,7 @@ local function getAppropriateWorkshop(unit, collection)
             end
         end
     end
-    return #closest.jobs < 10 and closest or nil
+    return (closest and #closest.jobs < 10) and closest or nil
 end
 
 local function shearCreature(unit, workshop)