Chinsky f53fa1dee2 Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro ...

Conflicts:
	code/modules/virus2/disease2.dm
	code/modules/virus2/effect.dm

2013-10-06 13:34:50 +04:00

..

__HELPERS

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

2013-09-02 23:32:33 +01:00

ATMOSPHERICS

Refactors code to work with BYOND 500.

2013-09-22 12:39:48 +01:00

controllers

Merge pull request #3716 from DJSnapshot/bugfix

2013-09-30 07:53:49 -07:00

datums

Merge resolution, using dev-freeze map.

2013-09-09 21:59:47 -07:00

defines

Refactors code to work with BYOND 500.

2013-09-22 12:39:48 +01:00

FEA

…

game

Merge branch 'virofixes' into viro

2013-10-06 05:23:47 +04:00

js

…

modules

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

2013-10-06 13:34:50 +04:00

TriDimension

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

unused

These files have been collapsed into root procs and can be deleted.

2013-08-16 17:48:25 -07:00

WorkInProgress

Merge branch 'master' into dev

2013-09-26 10:26:03 +01:00

ZAS

Merge branch 'virofixes' into viro

2013-10-06 05:23:47 +04:00

global.dm

First pass on experimental change that allows zones to "Sleep"

2013-09-11 11:43:42 -07:00

hub.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00

names.dm

…

setup.dm

Merge branch 'virofixes' into viro

2013-10-06 05:23:47 +04:00

stylesheet.dm

…

world.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00