Kelenius 6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm

2015-05-21 17:00:50 +03:00

..

__HELPERS

Fixes #9210.

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

_defines

…

_onclick

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00

ATMOSPHERICS

Creates a default vent for atmospherics tanks.

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

controllers

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00

datums

Merge pull request #9264 from Hubblenaut/airlocks

2015-05-18 18:21:05 +03:00

defines

Merge pull request #9165 from Yoshax/trapping

2015-05-19 01:43:05 +03:00

FEA

Adds Destroys.

2015-04-24 17:11:14 +02:00

game

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00

js

…

modules

Merge branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03: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 branch 'dev' into ofClicksAndCooldowns

2015-05-21 17:00:50 +03:00

stylesheet.dm

…

world.dm

Merge resolution.

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