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

Conflicts:
	code/modules/mob/transform_procs.dm

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

..

__DEFINES

Abduction Update Two:

2015-04-26 01:30:59 +02:00

__HELPERS

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

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

_globalvars

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

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

_onclick

Removed some more spans from visible messages.

2015-04-24 21:06:59 +03:00

ATMOSPHERICS

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

2015-04-26 15:31:45 +01:00

controllers

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

datums

Merge pull request #9115 from AnturK/abduction_udpate_dos

2015-04-26 15:38:19 +01:00

defines

…

game

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

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

js

…

LINDA

…

modules

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

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

_compile_options.dm

Buffs airlock crushing.

2015-04-11 11:41:15 +01:00

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