Chinsky 4cd4217488 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge ...

Conflicts:
	code/modules/organs/organ_external.dm

2014-06-24 04:22:28 +04:00

..

blood.dm

Fixes #5264

2014-06-21 17:52:59 +04:00

organ_external.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge

2014-06-24 04:22:28 +04:00

organ_internal.dm

Having an infection raises your body temperature

2014-06-21 16:55:07 -04:00

organ.dm

Infections now spread between organs

2014-06-20 23:22:03 -04:00

pain.dm

Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags.

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

wound.dm

Body temperature fixes and updates

2014-06-20 18:18:02 -04:00