Chinsky 3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev ...

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm

2014-10-20 04:52:45 +04:00

..

client defines.dm

…

client procs.dm

Move NanoUI cache update to client/New()

2014-10-11 18:40:09 +01:00

preferences_factions.dm

…

preferences_gear.dm

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

2014-10-20 04:52:45 +04:00

preferences_savefile.dm

Merge pull request #6750 from Baystation12/dev-freeze

2014-10-16 20:07:35 +04:00

preferences_spawnpoints.dm

…

preferences_toggles.dm

Fix intent switching using Change-UI

2014-10-18 16:29:05 +01:00

preferences.dm

Makes the number of load/storable character slots a configurable value.

2014-10-14 10:05:22 +02:00