carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems ...

Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm

2015-01-04 01:52:14 +00:00

..

client defines.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

client procs.dm

Fixes error with logging admin rank changes to the user's database record.

2014-12-31 23:19:43 -08:00

preferences_savefile.dm

Revert "Adds mouse pointers for different ui styles"

2014-12-31 02:17:50 -03:00

preferences_toggles.dm

Adds a separate preference for whispers. Fixed #4658 Fixed #4712

2014-09-07 14:29:58 +02:00

preferences.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems

2015-01-04 01:52:14 +00:00