Tigercat2000 356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT ...

Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm

2015-12-03 11:03:01 -08:00

..

login.dm

Hotkey/interface update

2015-09-30 01:02:58 +02:00

logout.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

observer.dm

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-03 11:03:01 -08:00

say.dm

…

spells.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00