Aronai Sieyes 9fc0b7dabd Fix merge conflicts

2018-06-16 14:10:02 -04:00

..

internal

Merge pull request #5339 from Anewbe/eye_color

2018-06-10 15:39:37 -04:00

subtypes

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018

2018-05-27 19:26:12 -04:00

blood.dm

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

2018-03-15 22:41:14 -04:00

misc.dm

…

organ_external_vr.dm

VS: Nano ignores organ robotics sometimes

2018-03-17 19:45:59 -04:00

organ_external.dm

Robolimb brand damage tweaks, makes VeyMed more fragile (#5183)

2018-06-10 20:49:11 -04:00

organ_icon.dm

Fix merge conflicts

2018-06-16 14:10:02 -04:00

organ_internal.dm

Clears out the rest of them and leaves comments.

2017-10-21 15:38:19 -04:00

organ_stump.dm

…

organ.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018

2018-05-27 19:26:12 -04:00

pain.dm

…

robolimbs_vr.dm

Fixes tesh being able to use all prosthetics

2018-04-23 23:03:00 -04:00

robolimbs.dm

Remove Veymed portion of change for weakness

2018-06-15 08:55:20 -04:00

wound.dm

…