Jordie0608 0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen ...

Conflicts:
	code/modules/admin/verbs/pray.dm

2015-06-16 17:24:20 +10:00

..

client defines.dm

Initial pass to convert LF to CRLF

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

client procs.dm

JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging

2015-06-14 23:37:35 +10:00

preferences_savefile.dm

hotfix for character save compatibility with the features system (aka custom lizards)

2015-06-15 19:20:50 -04:00

preferences_toggles.dm

Merge pull request #9139 from Xhuis/pray_4_fun

2015-06-11 02:58:46 +03:00

preferences.dm

Merge pull request #9955 from kingofkosmos/spanspaceremoval

2015-06-15 18:20:04 +02:00