add pacifist trait
add missing )
add combat_skill tag
Changes in some professions skills out of logic

-Removed the Butler/maid throwing skill.
-Reduced the Ballroom Dancer dodging skill to 1.
-Removed the dodging skill from mail carrier.
-Removed the melee skill from Convict.
Give the Ballroom Dancer his dodge point back
Changed Mailman's description and returned respective skills to their owners once again
Punctuation and capital letters
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)
Glassworking first pass.
accessory for men
.
Tweak.
Tweak.
Vending machines, mkII
Parks and megastores
bug(overmap): fix FTBFS on OS X 10.6

 * Compilation fails on OS X 10.6 with the following error message:

    g++ -DMACOSX -Werror -Wall -Wextra -Wno-switch -Wno-sign-compare -Wno-missing-braces -Wno-unused-parameter -g   -MMD -mmacosx-version-min=10.6 -c src/addiction.cpp -o obj/addiction.o
    In file included from src/map.h:14,
                     from src/game.h:6,
                     from src/addiction.cpp:2:
    /usr/include/c++/4.2.1/bits/stl_map.h: In instantiation of ‘std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, oter_t&, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, oter_t&> > >’:
    src/overmap.h:47:   instantiated from here
    /usr/include/c++/4.2.1/bits/stl_map.h:342: error: forming reference to reference type ‘oter_t&’
    /usr/include/c++/4.2.1/bits/stl_map.h:364: error: forming reference to reference type ‘oter_t&’
    /usr/include/c++/4.2.1/bits/stl_map.h:373: error: forming reference to reference type ‘oter_t&’
    /usr/include/c++/4.2.1/bits/stl_pair.h: In instantiation of ‘std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, oter_t&>’:
    src/overmap.h:52:   instantiated from here
    /usr/include/c++/4.2.1/bits/stl_pair.h:84: error: forming reference to reference type ‘oter_t&’
    make: *** [obj/addiction.o] Error 1

   Fixed by removing & from oter&.
cleanup(overmap): remove unused function

 * The base_oter_id() function was added in commit 51ec332e, but never
   used.  I think it was intended to replace the code in
   oter_weight_list.setup().  Since no one else is using it, delete it
   for now.
bug(monattack): friendly laser turrets shouldn't shoot you

 * A misplaced return statement means a friendly laser turret might take
   a pot-shot at you after missing your enemies.  Knock it off, laser
   turret!
fix(npctalk): show npc dialogue when LOCALIZE=0

 * When compiled with LOCALIZE=0, the _() macro ignores positional
   arguments.  This was causing the user dialogue options to be blank,
   since rmp_format() thinks the trial type is the dialogue text.
   Split trial and standard dialogue code to fix.