add pacifist trait
add missing )
add combat_skill tag
Steel frame crafting recipe now respects conservation of mass.
.
typo
more
oops
more spaces
HUGE fix

HUGE was supposed to mess up your clothing.  Now it does.

(Tweaked the prereqs for these as well--now you'll get some muscle
upgrades before bulking out.)
changes to pacifist trait

pacifists feel guilty about killing humanoids (HUMAN flag)

pacifists feel 5x as guilty about killing zombies with GUILT flag
(*1/2 reduction instead of normal *1/10)
Merge pull request #5390 from ianestrachan/fix-frame-chunks-needed

Steel frame crafting recipe now respects conservation of mass.
Merge pull request #5391 from Lain-/typo

Fix several typos.
Glassworking first pass.
fix typo for barrette.
accessory for men
.
Tweak.
Tweak.
Vending machines, mkII