ccomp5950 27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev ...

Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm

2015-01-06 12:36:28 -05:00

..

__HELPERS

Merge pull request #7534 from mwerezak/doors

2014-12-28 13:14:23 +10:30

_onclick

Fixes #7596

2015-01-02 19:55:50 +10:30

ATMOSPHERICS

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

2015-01-06 12:36:28 -05:00

controllers

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

datums

Gets rid of the white wire in Omega's new wire system. The background of the UI is white, so you can't read the wire's name. I replace it with dark red.

2015-01-04 22:26:41 -05:00

defines

Table/rack refactor. Fixes #7509

2014-12-24 12:14:48 +10:30

FEA

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

game

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

2015-01-06 12:36:28 -05:00

js

…

modules

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

2015-01-06 12:36:28 -05:00

TriDimension

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

unused

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

WorkInProgress

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

ZAS

ZAS Emergency fix

2015-01-04 02:16:07 +01:00

global.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

hub.dm

…

names.dm

…

setup.dm

Throwing speed defines

2014-12-31 02:02:49 -05:00

stylesheet.dm

Converts \green macro to span tag

2014-12-28 02:06:02 -05:00

world.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30