Remie Richards 00bfe18348 Merge branch 'master' of https://github.com/tgstation/-tg-station into Synths ...

Conflicts:
	icons/mob/human.dmi

2015-12-04 20:23:32 +00: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

Make remove buttons for whole beaker, not individual chems

2015-12-03 14:33:28 -06:00

__HELPERS

Attack log coordinates

2015-12-01 19:56:39 -06:00

_globalvars

Merge pull request #12778 from AnturK/minor_upgrades

2015-11-15 09:07:21 +03:00

_onclick

Make Ctrl-Click unpull work by using the verb

2015-12-01 23:08:07 -05:00

ATMOSPHERICS

Merge pull request #13386 from neersighted/chem_love

2015-12-03 21:59:12 +00:00

controllers

Merge pull request #13419 from neersighted/sstimer_fix

2015-12-04 21:57:47 +03:00

datums

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

2015-12-04 20:23:32 +00:00

game

Merge pull request #13402 from AnturK/pressme

2015-12-04 22:21:48 +03:00

js

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

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

LINDA

this was a one-line fix why didn't someone do it before

2015-11-19 11:23:47 -05:00

modules

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

2015-12-04 20:23:32 +00: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

Jobban cleanup & performance improvements

2015-11-28 12:35:54 -03:00