Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

client defines.dm

Added a configuration option that allows putting the .rsc on external servers.

2013-06-11 21:28:59 +02:00

client procs.dm

Crash fix attempt: Moving NanoUI resource file sending away from client/New()

2014-04-25 17:47:27 -05:00

preferences_savefile.dm

Undershirts and rolling down jumpsuits!

2014-04-05 16:18:11 -07:00

preferences_toggles.dm

Added GhostRadio -- Allowing ghosts to spy on radio from anywhere

2014-01-04 12:25:09 +01:00

preferences.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00