mwerezak 09280953b2 Merge remote-tracking branch 'upstream/dev' into power-net ...

Conflicts:
	code/game/machinery/recharger.dm

2014-07-21 19:40:23 -04:00

..

__HELPERS

…

_onclick

Can now middle click doors to toggle bolt lights, plus cleanup.

2014-07-21 08:07:45 +02:00

ATMOSPHERICS

Some cleanup for pumps and vent pumps

2014-07-19 17:01:28 -04:00

controllers

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

2014-07-16 19:30:41 +09:30

datums

Now allows admin override via player panel, a small fix, and...

2014-07-14 19:02:21 -04:00

defines

Deluxe soap now has a more pleasant range of smells.

2014-07-17 12:54:51 +02:00

FEA

…

game

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

2014-07-21 19:40:23 -04:00

js

…

modules

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

2014-07-21 19:40:23 -04:00

TriDimension

…

unused

…

WorkInProgress

Merge resolution.

2014-07-21 16:34:38 +09:30

ZAS

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -04:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

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

2014-07-21 19:40:23 -04:00

stylesheet.dm

…

world.dm

…