Mark Aherne (Faerdan) de6e75c533 Merge branch 'master' of https://github.com/tgstation/-tg-station ...

Removed admins.txt conflict.

2013-09-01 13:42:06 +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

Added Nano UI Chemistry Dispenser.

2013-08-28 17:12:47 +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

Fixes #1147 - type-mismatch

2013-08-14 18:10:26 +01:00