Kelshark 92980edc93 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/game/jobs/job/science.dm
#	code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt

2017-10-29 18:14:56 -04:00

..

gear_tweaks.dm

…

loadout_accessories_vr.dm

Adds holo collar to loadout

2017-10-20 16:24:29 -04:00

loadout_accessories.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

loadout_cosmetics.dm

…

loadout_ears.dm

…

loadout_eyes_vr.dm

…

loadout_eyes.dm

Cleans up MedAviator code, adds normal aviators to the Command/Sec loadout

2017-10-23 16:30:09 -05:00

loadout_general.dm

…

loadout_gloves_vr.dm

…

loadout_gloves.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

loadout_head_vr.dm

Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)

2017-09-06 15:55:16 +03:00

loadout_head.dm

Polaris sync

2017-10-27 15:30:24 -04:00

loadout_mask.dm

…

loadout_shoes.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

loadout_smoking.dm

Adds a load of zippos to the loadout.

2017-07-17 14:57:14 -04:00

loadout_suit_vr.dm

Fixes code up.

2017-07-13 17:12:46 -04:00

loadout_suit.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

loadout_uniform_vr.dm

Return of the UNSC

2017-08-10 14:22:26 -04:00

loadout_uniform_yw.dm

Added the expeditionary jumpsuits to loadout list under suits and uniforms within new YW file to avoid wonderful clashes where possible.

2017-09-21 14:21:55 +01:00

loadout_uniform.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

loadout_utility.dm

Polaris Sync

2017-10-16 22:16:24 -04:00

loadout_xeno_vr.dm

Adds a loincloth to the xeno loadout

2017-09-11 21:18:29 -04:00

loadout_xeno.dm

please don't get mad at me github

2017-08-10 16:12:29 -04:00

loadout.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00