PsiOmega 83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm

2015-05-16 22:38:01 +02:00

..

__HELPERS

Fixes #9210.

2015-05-12 08:11:48 +02:00

_defines

…

_onclick

Final adjustments to icons, adds delay to pinning

2015-05-12 17:21:37 +02:00

ATMOSPHERICS

Creates a default vent for atmospherics tanks.

2015-05-14 15:31:39 +02:00

controllers

Merge pull request #9202 from Zuhayr/customitems

2015-05-14 21:47:04 +03:00

datums

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

defines

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

2015-05-14 22:20:58 +02:00

FEA

…

game

Merge pull request #9308 from Karolis2011/dev

2015-05-17 03:23:10 +09:30

js

…

modules

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

2015-05-16 22:38:01 +02:00

TriDimension

Grilles and rods.

2015-05-02 21:35:02 +02:00

ZAS

dynamic fire colours

2015-05-10 20:54:29 +01:00

global.dm

Merge pull request #9202 from Zuhayr/customitems

2015-05-14 21:47:04 +03:00

hub.dm

…

names.dm

…

setup.dm

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

2015-05-16 08:53:33 +01:00

stylesheet.dm

…

world.dm

Merge resolution.

2015-05-11 11:47:24 +09:30