xxalpha 3f29a9866c Merge remote-tracking branch 'upstream/master' into qdelFixes ...

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm

2015-08-31 08:52:30 +01:00

..

__DEFINES

adds ways to check references while qdel'ing; removes redundant compile option

2015-08-29 03:27:55 -06:00

__HELPERS

Merge pull request #11433 from Core0verload/framed

2015-08-30 13:43:19 -05: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

Merge pull request #11469 from Cheridan/crushed_it

2015-08-31 10:07:31 +03:00

game

Merge remote-tracking branch 'upstream/master' into qdelFixes

2015-08-31 08:52:30 +01: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 remote-tracking branch 'upstream/master' into qdelFixes

2015-08-31 08:52:30 +01:00

orphaned procs

…

_compile_options.dm

disables TESTING; it should not be enabled by default

2015-08-29 03:29:23 -06:00

hub.dm

…

world.dm

clean up world.dm

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