Incoming fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76 ...

Conflicts:
	code/modules/projectiles/projectile/magic.dm

2014-11-15 14:44:51 -05:00

..

__DEFINES

-Adds secure atmos closets to Atmos

2014-11-09 11:16:58 -08:00

__HELPERS

Fixes some roundstart runtimes relating to set_species().

2014-11-09 21:01:42 +01:00

_globalvars

Botcall Fix for MC lag + Tweak to floorbots

2014-11-02 19:01:43 -06:00

_onclick

Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx

2014-11-15 02:51:24 +03:00

ATMOSPHERICS

Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp

2014-11-13 18:55:53 -06:00

controllers

Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp

2014-11-13 18:55:53 -06:00

datums

Merge pull request #5755 from Miauw62/bughl

2014-11-14 14:50:46 -06:00

defines

* Added a wrapper proc for A* that returns an empty list when failing to find a path

2014-11-14 00:09:02 +01:00

game

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

2014-11-15 14:44:51 -05:00

js

…

LINDA

Fixes LINDA not properly activating turfs who are next to unsimulated turfs with differences (space turfs are unsimulated)

2014-11-05 14:54:29 -03:00

modules

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

2014-11-15 14:44:51 -05:00

unused

Conflicts solving

2014-11-04 20:24:52 +01:00

WorkInProgress

Removed hilarious but useless sleep() in closets/boxes New()

2014-11-10 01:59:32 +01:00

_compile_options.dm

…

hub.dm

…

world.dm

…