phil235 78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger ...

Conflicts:
	code/modules/events/ninja.dm

2015-03-15 12:30:27 +01:00

..

SDQL2

…

adminhelp.dm

Fixes irc alerts of adminhelps not showing the ckey

2015-03-03 04:05:08 -08:00

adminjump.dm

Fixes adminjump being dumb.

2015-03-07 19:00:48 +01:00

adminpm.dm

…

adminsay.dm

…

atmosdebug.dm

…

BrokenInhands.dm

optimizations to the way inhand files are found

2015-01-18 21:14:47 -08:00

buildmode.dm

Fixes buildmode throw function's help information. (left and right were switched)

2015-02-23 14:34:40 +01:00

cinematic.dm

…

deadsay.dm

Moves chat toggles into their own variable.

2015-03-05 18:38:07 +01:00

debug.dm

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

2015-02-27 21:15:01 +00:00

diagnostics.dm

Update diagnostics.dm

2015-02-13 17:30:52 +00:00

fps.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

getlogs.dm

…

mapping.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

massmodvar.dm

…

modifyvariables.dm

Adds the ability for admins to "take the shot" and end rounds at their discretion. This is behind a two confirmation gate with a 20 second reflection period between them. All this is logged.

2015-03-03 16:39:01 -05:00

one_click_antag.dm

Makes Gang mode functional again

2015-03-02 23:46:46 -07:00

onlyone.dm

…

panicbunker.dm

Tweaks panic bunker verb logic a little bit

2015-02-26 16:02:26 -08:00

playsound.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

possess.dm

…

pray.dm

Moves chat toggles into their own variable.

2015-03-05 18:38:07 +01:00

randomverbs.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger

2015-03-15 12:30:27 +01:00

reestablish_db_connection.dm

…

tripAI.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00