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

Conflicts:
	nano/templates/escape_pod_console.tmpl
	nano/templates/simple_docking_console_pod.tmpl

2014-07-06 23:26:26 +01:00

..

__HELPERS

helpers: fix move_contents_to() not moving air

2014-06-30 23:21:29 +01:00

_onclick

Turns movable chairs on click

2014-07-02 22:33:33 +02:00

ATMOSPHERICS

Fixes vents not properly resetting the pressure check correctly when the "default" value.

2014-07-01 23:04:08 +02:00

controllers

Merge pull request #5463 from mwerezak/emergency-shuttle

2014-07-03 05:10:35 +04:00

datums

Fixes #5483

2014-07-04 17:48:12 +09:30

defines

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

FEA

…

game

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

2014-07-06 17:50:53 +01:00

js

…

modules

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

2014-07-06 23:26:26 +01:00

TriDimension

…

unused

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

WorkInProgress

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

2014-07-06 17:50:53 +01:00

ZAS

atmos: make fires more destructive

2014-06-23 20:58:14 +01:00

global.dm

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

2014-06-24 19:22:18 +09:30

hub.dm

…

names.dm

…

setup.dm

Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing.

2014-07-01 01:03:50 +09:30

stylesheet.dm

…

world.dm

Fixes #4756

2014-06-17 17:25:57 +01:00