mer

Npc/Sprite mixed

fixed schemas

fixed hairstyles

fixed more npcs per the 1.5 sprite

fixed children and some more npc got basic clothes

fixed bernards hair
Fix female outline

repair dyes for sorcerer robes

fix broken robes dye; supersize terranite female

Fix Dyable stocking issue

Minor fix female shading and astray pixel

fix warlordplate female

Unhide Skirt Sprite

Rework previous sloppy job on warlord male

Rework of Tneck Sweater

Give Wizard Hat more frames

1.5ify WarlordBoots, 'Fix' Miniskirt
Fix Pink Ugly Sweater
Fix Male Fine Dress

Outline for bra and several fixes for female base

Fix missing outlines, shape of nutcracker hat

Add veryapes Contributorshirt
Unused file

Notes and Fixes to ease development in npcs.xml

Fixed Skeleton and Zombie NPCs
Fixed more fo the Unique NPCs

Skeleton with note thats dead

Fixed Undead Inn
Golbenez
Magic Shop
and Skeletons
Some minor NPCs need work there still

Pipe Basic for NPCs
Needs Work to be Equipment

Fixed more Npcs
Added Mustache

Added More Facial Hair
Fixed More Npcs
Reverted Jack

Fixed More NPCs
Adjusted Items

Fixed more NPCs

More fixed NPCs
desat and reperspective for some hats, dye demonmask and more fixes

remove transparency from cindy
change child stand frame
new child dress (#5)
fix old woman face
fix milly npc dress
New Sign Npcs
Added Child-in-bed xmls

Fixed Nurses Headband
Made Bandana dyeable
Moved Npc Accents to be used with tiles
Fixed map to adjust for new fringe collisions

rework santa hat
more love to npcs wearing instances of santas hat
tweaks on the child sprite

Fixed the color of Staff Weapons for NPCs

Condensed Working Override Items needed for launch.
make Knitcap dyable
more tweaks to child npcs
rework old witch hat and include in db
Give the inspector his hat back
unspikethrough wooden staff
fix errand pixels santahat

new xmas tree hat

add icons for new items

Fix dyability in several xmls
Change most of the basic colors to lower saturation
Merge remote-tracking branch 'chay/sprite-1.5' into Tonori-Art

Conflicts:
	graphics/sprites/equipment/head/bandana.png
	graphics/sprites/equipment/head/beret-female.xml
	graphics/sprites/equipment/head/beret-male.xml
	graphics/sprites/equipment/head/cashiershade.png
	graphics/sprites/equipment/head/jestermask-male.xml
	graphics/sprites/equipment/head/silkheadband.png
	graphics/sprites/equipment/head/tamoshanter.png
	graphics/sprites/equipment/head/wizard-hat.png
	graphics/sprites/equipment/legs/miniskirt-male.png
	graphics/sprites/equipment/legs/pants-male.png
	graphics/sprites/equipment/override/adult-head.png
	graphics/sprites/model/unique.xml
	graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
	graphics/sprites/monsters/slime-mother.xml
	graphics/sprites/npcs/bleeding-heart-tree.xml
	graphics/sprites/npcs/koga.xml
	graphics/sprites/npcs/npc-dicentra.xml
	graphics/sprites/npcs/npc-supply-crate.xml
	graphics/sprites/npcs/signs.png
	graphics/sprites/npcs/signs.xml
	graphics/sprites/npcs/weaver-wheel.xml
	graphics/sprites/player_female_base.xml
	graphics/sprites/player_male_base.xml
	graphics/tiles/desert_x2.png
	items.xml
	maps/009-1.tmx
	maps/009-2.tmx
	maps/018-3.tmx
	maps/021-1.tmx
	npcs.xml