Kilakk 4a10e9ce39 Merge remote-tracking branch 'upstream/dev' into dev ...

Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm

2014-01-01 11:51:53 -05:00

..

__HELPERS

Added some sanity to brightness proc

2013-12-26 17:18:17 +04:00

_onclick

Merged config and changelog.

2013-12-22 23:11:29 +10:30

ATMOSPHERICS

…

controllers

Added config toggle for ghost writing (for adminbus).

2013-12-28 23:53:20 +10:30

datums

DNA2 fixes cherrypicked from N3X15.

2013-12-23 00:06:56 +10:30

defines

Optimizations of PDA NanoUI

2013-12-28 19:38:14 -06:00

FEA

…

game

Merge remote-tracking branch 'upstream/dev' into dev

2014-01-01 11:51:53 -05:00

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2013-12-31 21:24:03 +10:30

TriDimension

…

unused

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

WorkInProgress

Merge pull request #4093 from comma/guestpass

2013-12-25 03:39:50 -08:00

ZAS

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

stylesheet.dm

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

world.dm

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00