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

Conflicts:
	code/__HELPERS/mobs.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/sprite_accessories.dm

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

..

client defines.dm

Initial pass to convert LF to CRLF

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

client procs.dm

Fixes some erros in the database system

2014-09-19 13:37:58 -07: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