Whitellama 7ced8104ca Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/objects/items/devices/transfer_valve.dm

2014-08-17 17:50:07 -07:00

..

__HELPERS

Tidy up and use more sane defaults.

2014-07-31 22:17:26 -06:00

_onclick

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

2014-07-25 17:19:59 -07: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 branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-07-25 17:19:59 -07:00

datums

Made arcane tomes a subtype of books, fixes #5838

2014-08-10 02:23:36 -07:00

defines

Moved all shard code to one file. Fixed #5992

2014-08-13 21:05:27 +01:00

FEA

…

game

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2014-08-17 17:50:07 -07:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2014-08-17 17:50:07 -07:00

TriDimension

…

unused

…

WorkInProgress

should fix #6030

2014-08-17 18:18:07 +02:00

ZAS

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Merge resolution.

2014-07-21 16:17:15 +09:30

stylesheet.dm

…

world.dm

…