Rename franklin.map to house_franklin.map
Merge remote-tracking branch 'upstream/master'
Lynn House

Added first floor of Lynn House. Added two new terrains, light gray
concrete and dark gray asphalt.
2nd floor + 3rd floor
removed unneeded terrains
file rename
caps in title
Add mutant rabbits, maybe.

Not sure about the colors yet, I'll figure it out.
Maybe kinda sorta add Mutant rabbit genera.

Maybe. Also might not be balenced
Tweaked hp and attack speed

I hope i figure the numbers out soon.
Update monsters.dat
Add Terrain_flag and Item_flag modifiers to fields.  Add flags to items (Item_flag).  Add TF_WATER Terrain_flag.
Merge pull request #9 from trevmillion/master

Looks great!
Merge branch 'master' of github.com:Whales/Cataclysm2
Add water flag to some terrain
More work on Field definition
Merge pull request #10 from Drakasin/master

House + Wooden (Stockade) Fence
Merge pull request #11 from superninjakiwi/master

Adding Mutant rabbits
Merge remote-tracking branch 'upstream/master'