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

..

planet.dm

Read github PR for details.

2017-10-10 00:48:27 -04:00

sif.dm

Hail is less omnicidal

2018-02-28 14:45:10 -06:00

time.dm

…

weather.dm

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

2018-02-17 00:35:29 -05:00