phil235 6aadd8df8d Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5 ...

Conflicts:
	code/modules/mob/living/carbon/life.dm

2015-04-23 01:32:20 +02:00

..

__DEFINES

- crate mimic have wrong icon var. 8953

2015-04-20 18:15:06 +02:00

__HELPERS

Merge pull request #8581 from MrPerson/lighting_2015

2015-04-12 13:14:32 +02:00

_globalvars

Revenants

2015-04-15 22:55:27 -04:00

_onclick

Merge pull request #8818 from norill/corner_pushing

2015-04-13 18:23:19 +10:00

ATMOSPHERICS

moved process() to datum. made /datum/reagents/ process instead of the containers.

2015-04-07 17:13:59 -07: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

Gang Update v3

2015-04-19 01:00:17 -06:00

defines

…

game

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

2015-04-23 01:32:20 +02:00

js

…

LINDA

…

modules

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

2015-04-23 01:32:20 +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