mwerezak 1c4239190d Having a vital internal organ die now kills you ...

Internal organs now die once they hit max_health.
Also adjusts final brain damage effect.

Conflicts:
	code/modules/organs/organ.dm

2015-05-30 18:53:20 -04:00

..

__HELPERS

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

2015-05-30 16:11:57 +02:00

_defines

Merge branch 'dev' into ofResearchAndPrototypes

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

_onclick

Dev-freeze into dev merge.

2015-05-30 00:31:12 +09:30

ATMOSPHERICS

…

controllers

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

2015-05-30 16:11:57 +02:00

datums

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

2015-05-30 16:11:57 +02:00

defines

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

2015-05-30 16:11:57 +02:00

FEA

…

game

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

2015-05-30 16:11:57 +02:00

js

…

modules

Having a vital internal organ die now kills you

2015-05-30 18:53:20 -04:00

TriDimension

Major sheet and material refactor.

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

ZAS

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

2015-05-30 15:59:54 +02:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Moved custom synth icons to the custom items repo.

2015-05-26 14:03:06 +09:30

stylesheet.dm

…

world.dm

Inactivity process tweaks.

2015-05-26 09:04:26 +02:00