Incoming 4ae1cf4eb5 Merge branch 'master' of https://github.com/tgstation/-tg-station into slime_time_live ...

Conflicts:
	icons/mob/actions.dmi

2015-10-29 23:08:28 -04:00

..

__DATASTRUCTURES

* Made the Priority Queue insertion use dichotomic search to find the position of the inserted element

2015-09-30 00:05:45 +02:00

__DEFINES

few more

2015-10-21 22:36:21 +02:00

__HELPERS

Merge pull request #12642 from tkdrg/FUCKpaprikaNIGGER

2015-10-26 00:35:52 -05:00

_globalvars

Merge pull request #12521 from optimumtact/why

2015-10-22 00:52:14 +02:00

_onclick

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

2015-10-29 23:08:28 -04:00

ATMOSPHERICS

fixes #11918

2015-10-04 07:39:00 -06:00

controllers

Adds a config option for the round end restart delay.

2015-10-26 05:04:43 -07:00

datums

Merge pull request #12629 from Incoming5643/Im_all_for_fun_xenobio_endtier_rewards_but_this_is_ridiculous

2015-10-29 04:46:41 +03:00

game

Merge pull request #12330 from feemjmeem/tanksuicide-refactor

2015-10-29 14:27:37 +11:00

js

…

LINDA

Fixes hotspot having two New() procs.

2015-10-08 19:50:01 +02:00

modules

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

2015-10-29 23:08:28 -04:00

orphaned procs

Tweaked the "max path length" logic in A*.

2015-10-02 22:54:53 +02:00

_compile_options.dm

Cleans up map rotation code, removes debugging code

2015-09-30 08:43:22 -07:00

hub.dm

…

world.dm

Adds a config option for the round end restart delay.

2015-10-26 05:04:43 -07:00