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

Conflicts:
	code/modules/client/preferences.dm

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

..

__HELPERS

Added . and # prefix to language keys checks (like radios)

2014-07-23 21:58:50 -05: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

Merging.

2014-07-25 22:50:35 +09:30

defines

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

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

FEA

…

game

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

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

js

…

modules

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

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

TriDimension

…

unused

…

WorkInProgress

Merge resolution.

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

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

…