Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

antagonist

Another Big Technomancer PR

2016-10-22 11:51:12 -04:00

area

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

dna

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

gamemodes

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

2016-11-04 15:42:32 -04:00

jobs

Adds for centcom jobs

2016-10-22 18:35:13 -04:00

machinery

Added one word

2016-10-21 01:04:31 -04:00

magic

…

mecha

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

objects

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

2016-11-04 15:42:32 -04:00

turfs

Allow wet 'downgrades' on turfs

2016-10-26 22:21:48 -04:00

vehicles

…

verbs

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

2016-10-20 21:24:07 -04:00

atoms_movable.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

atoms.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

supplyshuttle.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

trader_visit.dm

…