Zalvine 474728e540 fixing this all for PR, whee. (+1 squashed commits) ...

Squashed commits:

[3981ec7311] fixing this all for PR, whee.

2017-04-06 09:27:13 -05:00

..

internal

Fixes the conflicts in the original branch

2017-03-22 17:51:04 -05:00

subtypes

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

blood.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

misc.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

organ_external.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

organ_icon.dm

Merge pull request #3152 from VOREStation/aro-pol-bodymarks

2017-03-30 20:13:15 -05:00

organ_internal.dm

Fixes the conflicts in the original branch

2017-03-22 17:51:04 -05:00

organ_stump.dm

…

organ.dm

Merge pull request #3158 from Anewbe/fbp_screams

2017-03-28 20:03:01 -05:00

pain.dm

Should fix a Travis issue

2017-03-28 20:24:17 -05:00

robolimbs_vr.dm

fixing this all for PR, whee. (+1 squashed commits)

2017-04-06 09:27:13 -05:00

robolimbs.dm

Fixes the color application on Vey-Med prosthetics

2017-03-29 00:42:53 +01:00

wound.dm

Bruises now bleed at a much higher damage threshold.

2016-10-11 22:28:57 -05:00