carnie 3317aa9fe3 Merge branch 'master' of github.com:tgstation/-tg-station into FUTURE_DNA_2 ...

Conflicts:
	code/game/dna.dm  <-- leave this shit alone unless it's a small-tidy change. ffs.

2013-08-06 09:54:24 +01:00

..

client defines.dm

Merge branch 'RemoteResources' of https://github.com/Carn/-tg-station into RemoteRes

2013-07-04 01:59:04 +01:00

client procs.dm

Choose Profession

2013-08-01 18:09:58 +01:00

preferences_savefile.dm

Renamed variables:

2013-08-01 13:48:41 +01:00

preferences_toggles.dm

* Re-named the verb "Pick Ghost Form" to "Choose Ghost Form". It was interfering with the "pick up" verb which people can easily access by typing "pi" then space. A very minor convenience thing.

2013-07-12 20:18:16 +01:00

preferences.dm

Renamed variables:

2013-08-01 13:48:41 +01:00