PsiOmega 95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm

2015-09-05 09:35:02 +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 with master.

2015-08-18 11:31:10 -07:00

preferences_factions.dm

…

preferences_gear.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

preferences_savefile.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00

preferences_spawnpoints.dm

…

preferences_toggles.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00

preferences.dm

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

2015-09-05 09:35:02 +02:00

ui_style.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00