PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/cult/runes.dm

2015-04-08 10:40:38 +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

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

preferences_factions.dm

A bit of prep work for integegrating player-set backgrounds into gameplay.

2014-08-01 22:54:57 +09:30

preferences_gear.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-04-08 10:40:38 +02:00

preferences_savefile.dm

Fixes a sanity check turned insanity check forcing everyone to go commando.

2015-02-17 17:01:10 +03:00

preferences_spawnpoints.dm

Adds cyborg-only latejoin spawnpoint

2014-11-14 23:38:09 +00:00

preferences_toggles.dm

Added toggleable 'chat tags' that can mark different channels in chat.

2014-11-28 11:15:22 +01:00

preferences.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-03-23 11:45:32 +01:00