Rolan7 0fa91b06f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401 ...

Conflicts:
	code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict.  Opening it in tortoisemerge showed no conflicts and automatically cleared the status.  I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.

2014-07-07 13:42:31 -04:00

..

client defines.dm

Initial pass to convert LF to CRLF

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

client procs.dm

Security fixes for PR announcer

2014-04-21 10:51:04 +02:00

preferences_savefile.dm

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

2014-07-07 13:42:31 -04:00

preferences_toggles.dm

huge update

2014-04-14 21:07:00 +02:00

preferences.dm

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

2014-07-07 13:42:31 -04:00