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

..

collectable.dm

…

flowercrowns.dm

Wooden circlets can now be worn as hats

2017-04-01 15:31:06 -05:00

hardhat.dm

Loadout adjustments.

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

helmet_vr.dm

Some disorganizes changes by Aces

2017-09-21 03:22:20 -04:00

helmet.dm

Steals more modular armor code

2018-02-16 18:41:07 -06:00

jobs.dm

HoS/Warden helmet tweaks

2018-02-17 15:57:26 -06:00

misc_special.dm

Merge pull request #4519 from Neerti/12/15/2017_berserking

2018-01-11 20:57:50 -06:00

misc.dm

Loadout adjustments.

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

soft_caps.dm

…

solgov_vr.dm

Some disorganizes changes by Aces

2017-09-21 03:22:20 -04:00

solgov.dm

Removes the Home Guard beret

2017-05-21 14:40:48 -05:00