phil235 0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges ...

Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm

2016-02-10 22:35:19 +01: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

Rewrite supply packs/cargo orders

2016-02-07 04:45:55 -06:00

__HELPERS

Cleanup

2016-02-10 16:30:43 +01:00

__PATH_COMPATIBILITY

Formalises Path Compatibility

2015-12-28 22:20:33 +00:00

_globalvars

Nuke Tiles

2016-02-04 09:16:56 -06:00

_onclick

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

2016-02-10 22:35:19 +01:00

controllers

"YOU MISSED A SPOT!"

2016-02-08 21:21:10 -08:00

datums

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

2016-02-10 22:35:19 +01:00

game

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

2016-02-10 22:35:19 +01:00

js

…

modules

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

2016-02-10 22:35:19 +01:00

orphaned procs

Added passflag checking for A*.

2016-01-30 13:51:52 +01:00

_compile_options.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00

hub.dm

Adds a compile option for hub password

2016-01-01 19:23:06 -08:00

world.dm

Get the code running on 510

2016-02-04 17:19:40 -06:00