Kelenius ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes ...

Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm

2015-05-25 20:35:46 +03:00

..

__HELPERS

Fixes #9210.

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

_defines

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

_onclick

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

ATMOSPHERICS

Creates a default vent for atmospherics tanks.

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

controllers

Merge pull request #9300 from PsiOmegaDelta/RoundStart

2015-05-18 12:00:49 +03:00

datums

Attempting to guarantee immunity to viruses for virus_immune var.

2015-05-25 15:52:51 +09:30

defines

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

FEA

…

game

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-25 20:35:46 +03:00

js

…

modules

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-25 20:35:46 +03:00

TriDimension

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

ZAS

Cleans up debug prints

2015-05-19 17:47:51 -04:00

global.dm

Merge pull request #9202 from Zuhayr/customitems

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

hub.dm

…

names.dm

…

setup.dm

Removes redundant surgery for brain and eye repair, now covered by organ repair in general.

2015-05-25 14:49:57 +09:30

stylesheet.dm

…

world.dm

Merge resolution.

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