mwerezak 5ca36fcadb Merge branch 'dev' into power-net ...

Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl

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

..

__HELPERS

helpers: fix move_contents_to() not moving air

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

_onclick

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

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

ATMOSPHERICS

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -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

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

FEA

…

game

Merge branch 'dev' into power-net

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

js

…

modules

Merge branch 'dev' into power-net

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

TriDimension

…

unused

shuttle_controller now uses a shuttle datum

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

WorkInProgress

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

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

ZAS

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -04: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

Merge branch 'dev' into power-net

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

stylesheet.dm

Reverted verb, adjusted color

2014-05-22 16:34:45 -04:00

world.dm

Fixes #4756

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