Mloc-Hibernia 281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm

2014-07-18 13:08:12 +00:00

..

blood.dm

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

organ_external.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-07-18 13:08:12 +00:00

organ_internal.dm

Fixes germ levels going below zero

2014-07-12 16:18:29 -04:00

organ.dm

Fixes germ levels going below zero

2014-07-12 16:18:29 -04:00

pain.dm

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

wound.dm

Makes minor wounds harder to infect

2014-07-07 17:19:13 -04:00