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

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -04:00

..

gear_tweaks.dm

…

loadout_accessories_vr.dm

Loadout capitalization fixes

2018-01-31 20:31:41 -05:00

loadout_accessories.dm

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

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

loadout_cosmetics.dm

Loadout additions + fixes. (#4339)

2017-11-27 19:21:49 -06:00

loadout_ears.dm

Removes translators from the loadout (#4942)

2018-03-01 12:00:37 -08:00

loadout_eyes_vr.dm

Loadout capitalization fixes

2018-01-31 20:31:41 -05:00

loadout_eyes.dm

Adds SAR to allowed_roles of certain loadout items

2018-05-17 21:18:49 +10:00

loadout_general.dm

Loadout additions + fixes. (#4339)

2017-11-27 19:21:49 -06:00

loadout_gloves_vr.dm

Changes wedding rings to be a subtype of ring

2018-04-08 01:06:36 -04:00

loadout_gloves.dm

…

loadout_head_vr.dm

Loadout capitalization fixes

2018-01-31 20:31:41 -05:00

loadout_head.dm

Polaris sync

2017-12-21 04:01:07 -05:00

loadout_mask.dm

…

loadout_shoes_vr.dm

Adds Siren jumpsuit

2018-02-22 06:00:41 -06:00

loadout_shoes.dm

Sivian Western Sprite Pack (#4970)

2018-02-27 14:24:20 -06:00

loadout_smoking.dm

Loadout additions + fixes. (#4339)

2017-11-27 19:21:49 -06:00

loadout_suit_vr.dm

adds gn set

2017-11-22 23:53:59 +02:00

loadout_suit.dm

Adds SAR to allowed_roles of certain loadout items

2018-05-17 21:18:49 +10:00

loadout_uniform_vr.dm

Gives KHI CMD to all command staff

2018-05-23 16:58:10 -05:00

loadout_uniform_yw.dm

Smoll fixes to hueg ass update & merge

2018-01-24 21:04:12 -05:00

loadout_uniform.dm

Sivian Western Sprite Pack (#4970)

2018-02-27 14:24:20 -06:00

loadout_utility_vr.dm

Loadout capitalization fixes

2018-01-31 20:31:41 -05:00

loadout_utility.dm

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

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

loadout_xeno_vr.dm

…

loadout_xeno.dm

Species names should now use defines

2018-03-15 20:24:45 -05:00

loadout.dm

Multiple loadout slots (#4530)

2018-01-14 14:47:47 -06:00