Incoming 74f00a016d Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword ...

Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi

2015-10-31 19:56:13 -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

Merge pull request #12661 from KorPhaeron/mudamudamuda

2015-10-30 05:19:07 +00:00

__HELPERS

Makes orbit ensure orbiting is cleared on orbit exit

2015-10-28 13:28:16 -07:00

_globalvars

Merge pull request #12521 from optimumtact/why

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

_onclick

Merge pull request #12496 from kingofkosmos/interactivescreenalerts

2015-10-31 15:13:15 +03:00

ATMOSPHERICS

fixes #11918

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

controllers

Refactor mob movement delay calculation

2015-10-29 05:15:41 -07:00

datums

Merge pull request #12751 from Incoming5643/ok_it_was_OP_I_admit_it

2015-10-31 15:07:38 +03:00

game

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

2015-10-31 19:56:13 -04:00

js

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

LINDA

Fixes hotspot having two New() procs.

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

modules

Merge pull request #12726 from MrPerson/delay_of_game_5_yard_penalty_repeat_first_down

2015-11-01 02:04:44 +03: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