Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

__HELPERS

helpers: fix move_contents_to() not moving air

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

_onclick

Fixes #5088

2014-06-17 20:35:48 +01:00

ATMOSPHERICS

Merge pull request #5378 from PsiOmegaDelta/AlarmsAndVents

2014-06-29 18:33:16 +09:30

controllers

Merge pull request #5425 from Mloc/bs12-lightopt

2014-07-01 07:59:11 +09:30

datums

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

2014-06-23 00:25:39 -07:00

defines

Merge branch 'master' into dev

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

FEA

…

game

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

2014-06-30 23:44:46 +01:00

js

…

modules

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

2014-06-30 23:44:46 +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-freeze

2014-06-30 23:44:46 +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