Merge branch 'fix-crash-part_id_string' of https://github.com/vidarsk/Cataclysm-DDA into merge
Merge branch 'feat-veh-modify-times' of https://github.com/vidarsk/Cataclysm-DDA into merge
Check for null string in addition to no string so open doors aren't treated like liquids.
Adds QUEEN tag to the brain blob.
Armor pricing, through wristwatches

Going up through the file, stopped at leg-guards.
Regular translation template update
Merge remote-tracking branch 'VlasovVitaly/master' into FrankenMod
Merge remote-tracking branch 'kevingranade/fix-liquid-car-doors' into FrankenMod
Revert "Merge remote-tracking branch 'jeremyosborne/issue7440_joints' into FrankenMod"

This reverts commit aab3fa31e61501a69df90c5bfdce425f1db8fff1, reversing
changes made to e336bdac03f3ffeb746852d715f2e382a49045ec.
Merge remote-tracking branch 'VlasovVitaly/update-pot' into FrankenMod
Merge remote-tracking branch 'Rivet-the-Zombie/queen-slime-of-goo-mountain' into FrankenMod
Merge remote-tracking branch 'KA101/checkprice' into FrankenMod