mwerezak ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite ...

Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm

2015-02-10 20:59:22 -05:00

..

__HELPERS

Merge pull request #7844 from Kelenius/ofDryingAndRacks

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

_onclick

Changes slime stun probabilities

2015-02-04 02:07:14 +03:00

ATMOSPHERICS

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

controllers

Readded asteroid secret placement, adjusted some values.

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

datums

Merge pull request #8081 from comma/maximumtrinkets

2015-02-10 06:51:30 +01:00

defines

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

FEA

…

game

Merge remote-tracking branch 'upstream/dev' into gun-rewrite

2015-02-10 20:59:22 -05:00

js

…

modules

Merge remote-tracking branch 'upstream/dev' into gun-rewrite

2015-02-10 20:59:22 -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 remote-tracking branch 'upstream/dev' into gun-rewrite

2015-02-10 20:59:22 -05: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