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

Conflicts:
	code/game/machinery/teleporter.dm

2015-04-29 13:37:01 -04:00

..

client defines.dm

Initial pass to convert LF to CRLF

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

client procs.dm

Merge pull request #8132 from MrStonedOne/wellthen

2015-03-05 19:02:15 +01:00

preferences_savefile.dm

Cyborg and AI names are now also chosen in the preferences window, as well as chaplain religion and deity.

2015-04-25 18:28:29 +02:00

preferences_toggles.dm

Recieve --> receive grammarfix

2015-04-03 19:42:34 +03:00

preferences.dm

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

2015-04-29 13:37:01 -04:00