Mloc-Hibernia e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm

2014-05-11 13:19:09 +00:00

..

login.dm

Crash fix attempt: Moving NanoUI resource file sending away from client/New()

2014-04-25 17:47:27 -05:00

logout.dm

…

new_player.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-11 13:19:09 +00:00

poll.dm

- Added the ability to have multiple choice player polls.

2012-12-16 03:29:06 +00:00

preferences_setup.dm

Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!

2014-04-27 01:00:16 -06:00

skill.dm

…

sprite_accessories.dm

Few bugfixes - namely species hair still having do coloration = 0 and the tail rendering over equipment. Tajaran and Unathi sprites are also now black to facilitate more vibrant colors.

2014-04-27 04:05:55 -06:00