Novacat e2afa12e38 Merge pull request #4841 from VOREStation/upstream-merge-5992 ...

[MIRROR] Departmental Turtlenecks

2019-03-28 22:00:31 -04:00

..

gear_tweaks.dm

…

loadout_accessories_vr.dm

Code cleanup

2018-11-18 14:28:40 -05:00

loadout_accessories.dm

Conflict Resolution

2019-03-28 17:24:03 -04:00

loadout_cosmetics.dm

…

loadout_ears.dm

Yet Another Circuit Update (#5549)

2018-09-12 20:51:32 -05:00

loadout_eyes_vr.dm

Code cleanup

2018-11-18 14:28:40 -05:00

loadout_eyes.dm

Why is this even a conflict.

2019-03-27 14:24:57 -04:00

loadout_general.dm

…

loadout_gloves_vr.dm

…

loadout_gloves.dm

Yet Another Circuit Update (#5549)

2018-09-12 20:51:32 -05:00

loadout_head_vr.dm

…

loadout_head.dm

Merge branch 'master' into upstream-merge-5744

2019-02-23 11:51:40 -05:00

loadout_mask.dm

…

loadout_shoes_vr.dm

Code cleanup

2018-11-18 14:28:40 -05:00

loadout_shoes.dm

Yet Another Circuit Update (#5549)

2018-09-12 20:51:32 -05:00

loadout_smoking.dm

…

loadout_suit_vr.dm

Code cleanup

2018-11-18 14:28:40 -05:00

loadout_suit.dm

Merge pull request #4596 from VOREStation/upstream-merge-5783

2019-03-27 03:03:09 -04:00

loadout_uniform_vr.dm

…

loadout_uniform.dm

Merge pull request #5992 from mistyLuminescence/turtlenecks

2019-03-08 01:45:09 -05:00

loadout_utility_vr.dm

Code cleanup

2018-11-18 14:28:40 -05:00

loadout_utility.dm

…

loadout_xeno_vr.dm

…

loadout_xeno.dm

Merge pull request #4801 from VOREStation/upstream-merge-5974

2019-03-28 21:09:51 -04:00

loadout.dm

…