Incoming e84acea13b Fixes an instance where a sanity check was being mistakenly failed because blobs have a different sort of standard for being "alive" or "dead" than other antags. This will fix a problem where blob rounds weren't properly mulliganing.

2015-05-02 21:23:22 -04:00

..

__DEFINES

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

__HELPERS

Merge pull request #9205 from phil235/SpiderKnifeFixes

2015-04-29 08:23:10 -05:00

_globalvars

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

2015-04-27 00:11:49 +02:00

_onclick

git rebase mishap fix part 2

2015-04-29 02:35:36 -07:00

ATMOSPHERICS

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

controllers

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

datums

Merge pull request #9185 from AnturK/aliens_stole_my_branch_name

2015-05-02 23:59:48 +10:00

defines

…

game

Fixes an instance where a sanity check was being mistakenly failed because blobs have a different sort of standard for being "alive" or "dead" than other antags. This will fix a problem where blob rounds weren't properly mulliganing.

2015-05-02 21:23:22 -04:00

js

…

LINDA

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

modules

Merge pull request #9237 from Firecage/Butchering

2015-05-03 00:00:15 +10:00

_compile_options.dm

…

hub.dm

…

world.dm

Adds the "set round end sound" fun button so admins can override the generic sounds to play something else if want be.

2015-04-18 15:34:03 -04:00