mwerezak fac32d07e9 Merge remote-tracking branch 'upstream/dev' into boolit ...

Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm

2015-02-07 00:57:04 -05:00

..

__HELPERS

Merge pull request #7844 from Kelenius/ofDryingAndRacks

2015-02-04 18:15:13 +03:00

_onclick

Fixes runtime error: pick() from empty list

2015-01-13 13:37:07 -08:00

ATMOSPHERICS

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

controllers

Readded asteroid secret placement, adjusted some values.

2015-01-23 13:40:10 +10:30

datums

Supply packs, autolathe recipes, magazine and box definitions.

2015-02-06 20:16:35 -05:00

defines

Merge pull request #7924 from Kelenius/ofTablesAndPass

2015-01-30 16:17:41 +03:00

FEA

…

game

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

2015-02-06 20:23:05 -05:00

js

…

modules

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

2015-02-07 00:57:04 -05:00

TriDimension

…

ZAS

Cleared out my WIP folder.

2015-02-03 03:20:42 -07:00

global.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #8035 from PsiOmegaDelta/CanHasNano

2015-02-06 00:15:04 +03:00

stylesheet.dm

Update stylesheet.dm

2015-01-25 22:31:25 +01:00

world.dm

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30