Repede f772d7622c Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	config/custom_items.txt

2018-06-10 21:19:07 -04:00

..

internal

Merge pull request #5289 from fludd12/splat

2018-05-30 21:14:14 -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

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

2018-05-25 13:23:47 -04:00

organ_icon.dm

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

2018-03-31 09:20:59 -04:00

organ_internal.dm

…

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_yw.dm

…

robolimbs.dm

Merge pull request #5319 from SubberTheFabulous/LoveBranded

2018-06-02 16:22:56 -04:00

wound.dm

…