skull132 16d33365c2 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/customitems/item_defines.dm

2017-09-09 21:38:02 +03:00

..

gear_tweaks.dm

Lunchbox fixes (#1945)

2017-03-20 22:24:35 +02:00

loadout_accessories.dm

Rename Nursing Intern to Medical Resident (#3331)

2017-08-23 11:39:41 +03:00

loadout_cosmetics.dm

Loadout, clothing and accessories update and additions (#2267)

2017-05-17 13:49:47 +03:00

loadout_ears.dm

Port bay newest loadout system (#1648)

2017-01-29 21:52:09 +02:00

loadout_eyes.dm

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

loadout_general.dm

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

loadout_gloves.dm

Fashion update 2.0 (#3229)

2017-08-13 23:30:59 +03:00

loadout_head.dm

Rename Nursing Intern to Medical Resident (#3331)

2017-08-23 11:39:41 +03:00

loadout_mask.dm

Port bay newest loadout system (#1648)

2017-01-29 21:52:09 +02:00

loadout_shoes.dm

Allow loadout species whitelists to use lists (#3395)

2017-09-08 10:32:06 -05:00

loadout_smoking.dm

Port bay newest loadout system (#1648)

2017-01-29 21:52:09 +02:00

loadout_suit.dm

Rename Nursing Intern to Medical Resident (#3331)

2017-08-23 11:39:41 +03:00

loadout_uniform.dm

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

loadout_utility.dm

Port bay newest loadout system (#1648)

2017-01-29 21:52:09 +02:00

loadout_xeno.dm

Merge branch 'master' into development

2017-09-09 21:38:02 +03:00

loadout.dm

Allow loadout species whitelists to use lists (#3395)

2017-09-08 10:32:06 -05:00