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

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -04:00

..

antagonist

Gives renegade the LeMat.

2017-04-07 07:35:09 -04:00

area

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

dna

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

2017-04-25 15:04:54 -04:00

gamemodes

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

2017-04-25 15:04:54 -04:00

jobs

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

2017-04-25 15:04:54 -04:00

machinery

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

2017-04-25 15:04:54 -04:00

magic

…

mecha

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

2017-04-25 15:04:54 -04:00

objects

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

2017-04-25 15:04:54 -04:00

turfs

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

2017-04-25 15:04:54 -04:00

vehicles

…

verbs

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

2017-04-25 15:04:54 -04:00

atoms_movable.dm

De-snowflake thrown objects hitting turfs.

2017-04-17 13:13:40 -04:00

atoms.dm

Ports a bunch of fluff stuff

2017-02-21 13:50:14 -06:00

base_turf.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

json.dm

…

periodic_news.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

response_team.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

shuttle_engines.dm

Dynamic Shuttles - Code and Icon Changes

2017-03-25 21:00:08 -04:00

skincmd.dm

…

socket_talk.dm

…

sound.dm

Polaris Sync October 9th (#633)

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

supplyshuttle.dm

Adds Supply Shuttle Hook

2017-03-06 12:36:19 -05:00

trader_visit.dm

…