Cheridan fdf75bb6d7 Merge pull request #4982 from RemieRichards/AntagBeforeJobFixes ...

Fixes some bizarre job+antag interactions

2014-09-28 21:53:56 -05:00

..

__DEFINES

Resolved conflicts and addressed maintainer feedback.

2014-09-21 15:30:54 -06:00

__HELPERS

Merge pull request #4900 from MrStonedOne/erroageinjudgement

2014-09-26 23:41:37 +01:00

_globalvars

Merge pull request #4900 from MrStonedOne/erroageinjudgement

2014-09-26 23:41:37 +01:00

_onclick

Merge pull request #4809 from RemieRichards/Drones

2014-09-17 16:56:40 -05:00

ATMOSPHERICS

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

2014-09-25 18:45:53 +02:00

controllers

Merge pull request #4815 from phil235/AudibleMsgFix

2014-09-27 15:01:56 +02:00

datums

Merge pull request #4919 from Miauw62/tatorbalance

2014-09-27 17:13:50 -05:00

defines

Merge pull request #4900 from MrStonedOne/erroageinjudgement

2014-09-26 23:41:37 +01:00

game

Merge pull request #4982 from RemieRichards/AntagBeforeJobFixes

2014-09-28 21:53:56 -05:00

js

…

LINDA

The rest of the junk

2014-09-05 18:14:02 +04:00

modules

Merge pull request #4815 from phil235/AudibleMsgFix

2014-09-27 15:01:56 +02:00

unused

Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire

2014-09-24 16:58:23 +02:00

WorkInProgress

The rest of the junk

2014-09-05 18:14:02 +04:00

_compile_options.dm

…

hub.dm

…

world.dm

The rest of the junk

2014-09-05 18:14:02 +04:00