Jack Edge 58efb041a6 Merge branch 'library-of-brass-or-blood' of github.com:coiax/-tg-station into library-of-brass-or-blood ...

Conflicts:
	code/modules/library/lib_machines.dm

2016-12-23 16:14:21 +00:00

..

__DATASTRUCTURES

…

__DEFINES

Constant starlight (#22271)

2016-12-19 15:35:32 +13:00

__HELPERS

Cogscarabs can no longer hold slabs to produce components (#22295)

2016-12-20 14:38:51 +01:00

__PATH_COMPATIBILITY

…

_globalvars

YOG pAIS PART 1 - MOBILE CHASSIS (#21871)

2016-12-13 14:47:03 +13:00

_onclick

Intents can be cycled forward and backwards with hotkeys again (#22201)

2016-12-16 10:56:58 +13:00

controllers

Update pai.dm (#22313)

2016-12-20 14:40:47 +01:00

datums

Failed clockcult conversions are more obviously failed (#22303)

2016-12-20 08:38:31 -05:00

game

Tweak drop contents proc (#22310)

2016-12-20 14:42:08 +01:00

js

…

modules

Merge branch 'library-of-brass-or-blood' of github.com:coiax/-tg-station into library-of-brass-or-blood

2016-12-23 16:14:21 +00:00

orphaned_procs

These comments where removed by me.exe, just now

2016-12-08 01:48:46 -08:00

_compile_options.dm

…

world.dm

…