PsiOmegaDelta 185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm

2015-12-08 08:23:10 +01:00

..

subtypes

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

2015-12-08 08:23:10 +01:00

blood.dm

Porting forensics from Aurora.

2015-10-24 02:15:06 +10:30

misc.dm

…

organ_external.dm

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

2015-12-08 08:23:10 +01:00

organ_icon.dm

Limbs now copy hair data from their owner and may have optional body hair icons blended into them.

2015-08-31 16:34:13 +09:30

organ_internal.dm

Fixes #10546

2015-08-12 12:06:31 -04:00

organ_stump.dm

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

2015-09-11 08:38:28 +02:00

organ.dm

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

2015-12-08 08:09:37 +01:00

pain.dm

…

robolimbs.dm

Removes a leftover world <<

2015-12-02 18:21:09 +10:30

wound.dm

Bruise packs are used per wound and take time to apply

2015-10-16 16:36:04 +02:00