Aranclanos 0da6bf9430 Merge branch 'master' of https://github.com/tgstation/-tg-station into petemilking ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm

2015-08-29 23:14:57 -03:00

..

__DEFINES

-Adds swarmer as a language, makes them only able to speak to each other

2015-08-27 22:10:30 -07:00

__HELPERS

Fixes the brand intelligence event not triggering the uprising under certain conditions.

2015-08-24 07:52:54 -03:00

_globalvars

…

_onclick

-Adds swarmer as a language, makes them only able to speak to each other

2015-08-27 22:10:30 -07:00

ATMOSPHERICS

Merge pull request #11119 from phil235/VaporizeMethodReaction

2015-08-19 19:23:17 +10:00

controllers

Revert "Smooth out gliding so movement isn't (as) jerky"

2015-08-29 13:37:55 -07:00

datums

Added salt shaker and pepper mill to food crate

2015-08-19 15:16:12 +01:00

game

Fixes the changeling transformation sting, it wasn't working at all.

2015-08-29 22:33:57 -03:00

js

…

LINDA

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

2015-08-16 23:34:03 +02:00

modules

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

2015-08-29 23:14:57 -03:00

orphaned procs

…

_compile_options.dm

apparently using a beta build for the code to compile in the first place is a good idea vOv

2015-07-27 11:35:49 +02:00

hub.dm

…

world.dm

clean up world.dm

2015-08-18 14:35:55 +12:00