mwerezak 6eceb15fe6 Merge remote-tracking branch 'upstream/dev-freeze' into poster ...

Conflicts:
	code/game/turfs/simulated/walls.dm

2015-01-01 15:46:23 -05:00

..

__HELPERS

Merge pull request #7534 from mwerezak/doors

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

_onclick

Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly.

2014-12-28 19:16:07 +10:30

ATMOSPHERICS

Replaces awful connect type system with bitflags

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

controllers

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

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

datums

Fixes "To shuttle" button in nuke traitor panel

2014-12-29 13:08:48 +03:00

defines

Table/rack refactor. Fixes #7509

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

FEA

…

game

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

2015-01-01 15:46:23 -05:00

js

…

modules

Merge resolution.

2014-12-30 05:52:59 +10:30

TriDimension

Replaces awful connect type system with bitflags

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

unused

…

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

add sleeping for ZAS connection edges

2014-12-21 20:35:40 +00: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

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

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

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