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

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm

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

..

blood.dm

Fixed monkeys not getting space rabies via syringes.

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

organ_external.dm

Revert "Adds in the Kida"

2013-07-12 12:22:35 +01:00

organ_internal.dm

Moved ruptured lung effects into lung processing

2013-03-15 18:28:44 +04:00

organ.dm

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

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

pain.dm

Fixed toxloss messages.

2013-03-16 15:48:50 +01: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