PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm

2015-08-13 08:09:28 +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

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

2015-08-12 21:18:18 +02:00

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

Update preferences_gear.dm

2015-08-12 12:13:28 -05:00

preferences_savefile.dm

Attempts to fix old character save files in a slightly nicer way. Should mean there's no difference with converted characters, but you never know.

2015-07-11 23:24:56 +01:00

preferences_spawnpoints.dm

Adds cyborg-only latejoin spawnpoint

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

preferences_toggles.dm

Mob refactoring.

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

preferences.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-13 08:09:28 +02:00