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

Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm

2013-11-24 23:37:09 +00:00

..

blood.dm

Fixed monkeys not getting space rabies via syringes.

2013-08-04 00:32:37 +04:00

organ_external.dm

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

2013-11-24 23:37:09 +00:00

organ_internal.dm

* adding a 'rejuvinate' function to organs that fixes all types of damage

2013-10-11 12:39:54 -04:00

organ.dm

Replaces long check with lots of get_organ calls with shorter one.

2013-11-08 04:15:49 +04:00

pain.dm

Changes to Shutdown Syndrome.

2013-10-06 09:04:41 +04:00

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