phil235 3a93eeabba Merge branch 'master' of https://github.com/tgstation/-tg-station into DrinkingGlassPourFix ...

Conflicts:
	code/game/jobs/job/cargo_service.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/job.dm

2015-07-16 14:19:29 +02:00

..

client defines.dm

Removes topic limiter.

2015-07-11 23:09:04 -07:00

client procs.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

preferences_savefile.dm

Renames duplicate random_name() proc

2015-07-06 20:15:47 -06:00

preferences_toggles.dm

Removes autoclick for real this time

2015-06-29 23:27:20 +03:00

preferences.dm

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

2015-07-16 14:19:29 +02:00