Leshana 5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26 ...

# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png

2017-05-26 15:29:46 -04:00

..

gear_tweaks.dm

Underwear + setup merges (#1812)

2016-05-30 19:19:45 +01:00

loadout_accessories_vr.dm

Adds KH life crystal fluff/loadout item

2016-10-14 01:52:28 -04:00

loadout_accessories.dm

Fixes custom loadout and slot system.

2017-02-02 15:37:27 -05:00

loadout_cosmetics.dm

…

loadout_ears.dm

Makes translators more expensive

2017-03-26 17:36:36 -05:00

loadout_eyes_vr.dm

Improves AR glasses, makes them available

2017-03-05 20:58:59 -05:00

loadout_eyes.dm

Fixes a loadout issue

2017-02-26 14:28:44 +00:00

loadout_general.dm

Changelog, adds the dicecup to the loadout

2017-04-17 12:44:34 -05:00

loadout_gloves_vr.dm

Loadout path fix

2017-04-10 20:55:24 -04:00

loadout_gloves.dm

Ports a bunch of fluff stuff

2017-02-21 13:50:14 -06:00

loadout_head.dm

Ports a bunch of fluff stuff

2017-02-21 13:50:14 -06:00

loadout_mask.dm

…

loadout_shoes.dm

Adds greyscale sprites for heels worn/held/on the ground. (#3133)

2017-03-25 16:48:39 -05:00

loadout_smoking.dm

Adds fine smokables to the loadout

2016-06-10 22:04:07 -05:00

loadout_suit_vr.dm

Colorable loadout items

2017-03-02 12:56:09 +00:00

loadout_suit.dm

Adds 4 new clothing sprites & puts them in the loadout.

2017-05-22 18:08:01 -05:00

loadout_uniform_vr.dm

Update loadout_uniform_vr.dm

2017-04-03 23:04:31 -05:00

loadout_uniform.dm

Adds 4 new clothing sprites & puts them in the loadout.

2017-05-22 18:08:01 -05:00

loadout_utility.dm

Merge pull request #3216 from Neerti/3/22/2017_the_empress_protects

2017-04-08 13:02:43 -05:00

loadout_xeno_vr.dm

Fixes loadout stuff

2017-02-22 01:08:58 +00:00

loadout_xeno.dm

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

2017-04-01 19:19:42 -04:00

loadout.dm

Simple fix is good fix

2016-11-18 22:32:45 -06:00