Arokha Sieyes 68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm

2018-03-03 13:09:57 -05:00

..

collectable.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

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

Sivian Western Sprite Pack (#4970)

2018-02-27 14:24:20 -06:00

soft_caps.dm

1.6.4 Port of Baystation head items.

2016-11-26 15:57:15 -08:00

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