fix
fix
Merge remote-tracking branch 'dda/pr/9102' into dda-master

* dda/pr/9102:
  Snippet library: added an optional id to snippets.
  Allow professions to specific the description of the starting items.
  Professions return the combined item list including gender specific and gender-neutral items.
  Add translation for snippet text inside of item definitions:
  Allow random descriptions to be specified in the item definition:
  Allow random descriptions for all item types.
Fix for #9153.

Fixes https://github.com/CleverRaven/Cataclysm-DDA/issues/9153.
Allow making flour with barley.
Make some snippet_library methods private.
Changed fertilizer bomb recipe.
Changed liquid fertilizer recipe.
Add a t-shirt with text using the new generalized snippets system.
Give the computer hacker profession an appropriate t-shirt.
Updates map id to "warehouse_north"
Adds rotate = true to warehouse
Updates map id to "warehouse_north" in layout
Make syntax of joke bash command on t-shirt more general.
Rolls back name update for layout
Require planks *AND* nails to make barricades.
Murder some tabs -- just straight up %s/\t/    /g.
Added sugar beet syrup.

It functions similarly to maple syrup, but it's generally not as good. It's easier to craft than sugar, but less useful.
Merge branch 'hotairfix' of https://github.com/Mshock777/Cataclysm-DDA into merge2
Merge branch 'bowl-socks' of https://github.com/Mshock777/Cataclysm-DDA into merge2