Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

..

login.dm

…

logout.dm

…

new_player.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

poll.dm

…

preferences_setup.dm

Fixed xenobiologist having no preview clothes in character setup

2014-08-31 16:22:43 -07:00

skill.dm

space law -> Corporate regs in skills

2014-07-13 13:47:07 -07:00

sprite_accessories.dm

Adds new hair.

2014-08-13 20:15:07 -05:00