PsiOmega 1a000b0e0f Merge remote-tracking branch 'upstream/dev' into NarsiePort ...

Conflicts:
	code/modules/mob/living/carbon/human/say.dm

2015-03-29 13:04:53 +02:00

..

client defines.dm

Staff now have a "re-admin self" button after de-admining themselves.

2015-03-05 11:05:58 -05:00

client procs.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

preferences_factions.dm

…

preferences_gear.dm

Adds custom item for Von2531

2015-03-09 16:57:10 -04:00

preferences_savefile.dm

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

preferences_spawnpoints.dm

…

preferences_toggles.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

preferences.dm

Merge remote-tracking branch 'upstream/dev' into sanitize_procs

2015-03-25 01:06:32 +03:00