Malkevin 457b739e28 Merge branch 'master' of https://github.com/tgstation/-tg-station into implants ...

Conflicts:
	code/game/machinery/computer/prisoner.dm
	code/game/objects/items/weapons/implants/implant.dm

2016-02-11 23:41:57 +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

Merge pull request #15229 from Shadowlight213/Muteall

2016-02-10 21:34:30 -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 pull request #15405 from phil235/VisionDisposalFix

2016-02-11 23:25:44 +01:00

controllers

"YOU MISSED A SPOT!"

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

datums

Merge pull request #15381 from neersighted/runtime_meet_proc

2016-02-10 23:50:38 -06:00

game

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

2016-02-11 23:41:57 +00:00

js

…

modules

Merge pull request #15404 from phil235/AlienWeakenedFix

2016-02-11 23:27:24 +01:00

orphaned procs

Adds a preference to mute Centcom, alert level, and VOX sounds

2016-02-05 21:41:16 -08: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