Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01: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 git://github.com/Baystation12/Baystation12 into dev

2013-08-31 17:45:31 +01:00

organ_internal.dm

Fix for negative damage.

2013-08-23 15:33:51 +03:00

organ.dm

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

2013-08-04 01:40:32 +04:00

pain.dm

Compile fixes for organ/reagent code.

2013-08-04 11:25:40 -07: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