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

Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/mob/living/simple_animal/friendly/lizard.dm
	code/modules/mob/living/simple_animal/friendly/mouse.dm
	code/modules/mob/living/simple_animal/hostile/bees.dm

2015-04-08 19:10:20 +02:00

..

__DEFINES

Makes living/verb/resist more object oriented.

2015-04-06 18:45:37 +02:00

__HELPERS

Remove an infinite loop in getFlatIcon

2015-04-01 00:10:24 +13:00

_globalvars

Randomizes Order of Job Spawn Points

2015-03-02 20:01:36 -07:00

_onclick

Merge pull request #8520 from MrPerson/effect_cleanup

2015-03-30 01:21:40 +11:00

ATMOSPHERICS

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

2015-04-07 17:13:59 -07:00

controllers

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

2015-04-07 17:13:59 -07:00

datums

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

2015-04-07 17:13:59 -07:00

defines

Day Who-Knows: Bar Gambling Expansion!

2015-03-29 18:09:54 -05:00

game

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

2015-04-08 19:10:20 +02:00

js

…

LINDA

Fixes fires in the walls

2015-03-20 05:50:06 +03:00

modules

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

2015-04-08 19:10:20 +02:00

_compile_options.dm

…

hub.dm

…

world.dm

Moves chat toggles into their own variable.

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