GunHog 20bd9976b7 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition ...

Conflicts:
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/mulebot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/devices/PDA/cart.dm

2014-10-21 18:06:04 -05:00

..

client defines.dm

Initial pass to convert LF to CRLF

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

client procs.dm

Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition

2014-10-21 18:06:04 -05:00

preferences_savefile.dm

Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2

2014-10-08 09:48:49 -07:00

preferences_toggles.dm

Adds a separate preference for whispers. Fixed #4658 Fixed #4712

2014-09-07 14:29:58 +02:00

preferences.dm

Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2

2014-10-08 09:48:49 -07:00