Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05: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

Ok, part 1 of this huge mind datum fix. I need to run over the next part again because I've made a lot inconsistencies in it. This is sort of all the misc stuff that got tidied up whilst I was trying to get my head around how everything related to eachother.

2012-08-05 15:29:15 +00:00

new_player.dm

Say code fixes.

2014-04-20 04:37:46 -05:00

poll.dm

- Added the ability to have multiple choice player polls.

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

preferences_setup.dm

Undershirts and rolling down jumpsuits!

2014-04-05 16:18:11 -07:00

skill.dm

"Space Law" on the wiki is always capitalized, so now it should be in-game too.

2012-07-31 04:45:07 -04:00

sprite_accessories.dm

IPC hairstyles.

2014-01-28 15:58:26 +10:30