Neerti 2daac2d647 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks ...

# Conflicts resolved:
#	code/modules/mob/living/carbon/human/human_defense.dm

2016-02-06 01:55:02 -05:00

..

subtypes

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate

2016-01-30 08:49:35 +10:30

blood.dm

Removes the old virus system

2016-01-27 11:44:41 +03:00

misc.dm

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

organ_external.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks

2016-02-06 01:55:02 -05:00

organ_icon.dm

Robotic limbs and non-DNA mobs will now respect gendered icons.

2016-01-14 01:44:23 +10:30

organ_internal.dm

Removes the old virus system

2016-01-27 11:44:41 +03:00

organ_stump.dm

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

organ.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks

2016-02-06 01:55:02 -05:00

pain.dm

Further work on properly integrating, updating and fixing prosthetic options.

2015-12-24 21:10:33 +10:30

robolimbs.dm

Surface rename of Seromi to Teshari.

2016-02-06 12:50:16 +10:30

wound.dm

Revert 58ef59734f

2015-11-08 10:09:14 -05:00