Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence ...

Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi

2015-10-07 22:24:53 +01:00

..

client defines.dm

MERGE CONFLICTS, MY ONLY WEAKNESS

2015-09-26 23:42:14 -07:00

client procs.dm

8 reasons frying a cpu will change the way you think about everything.

2015-10-05 03:33:38 +02:00

message.dm

Cleans up isbanned() and stickyban handling

2015-09-26 23:30:26 -07:00

preferences_savefile.dm

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

2015-10-07 22:24:53 +01:00

preferences_toggles.dm

About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working.

2015-10-07 22:11:19 +01:00

preferences.dm

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

2015-10-07 22:24:53 +01:00