Ccomp5950 56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -05:00

..

blood.dm

Fixed blood injections not transmitting viruses properly.

2014-03-10 16:16:14 +04:00

organ_external.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-03-28 18:46:04 -05:00

organ_internal.dm

Merge Fixes

2013-11-14 13:08:40 -05:00

organ.dm

Code effeciency project: Handle_Organs (human/life())

2014-03-22 04:33:48 -05:00

pain.dm

Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags.

2014-01-05 23:59:39 +10:30

wound.dm

Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter.

2013-06-27 08:47:15 -07:00