Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 ...

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-02-23 21:55:42 -05:00

..

accessories

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

2018-02-23 21:55:42 -05:00

jobs

Grammar time, again. (#4402)

2017-12-05 14:34:45 -06:00

xenos

Fixes a few borked teshari cloaks

2017-11-19 00:09:45 -05:00

color.dm

Grammar time, again. (#4402)

2017-12-05 14:34:45 -06:00

imperial_vr.dm

Imperial Military Update

2017-09-02 04:07:25 -04:00

miscellaneous_vr.dm

Whoops

2018-02-21 16:50:26 -05:00

miscellaneous.dm

Loadout adjustments.

2017-12-02 08:59:46 -05:00

nanotrasen_vr.dm

Committing on behalf of Dhaeleena

2017-04-28 21:48:17 -04:00

pants.dm

Enables the combo blend mode for most colorable loadout gear.

2017-11-02 15:33:52 +02:00

shorts.dm

Fixes a few things

2017-03-28 21:15:45 +01:00

solgov_vr.dm

Updates paths due to Polaris change

2017-12-25 22:31:01 -05:00

solgov.dm

Clothing adjustments and fix

2018-02-09 15:21:15 -08:00

syndicate.dm

…