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.dm

Removed the Vox Pox.

2016-02-20 11:24:19 +10:30

departmental.dm

…

escape_pods.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-26 20:28:47 +02:00

shuttle_console.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

shuttle_emergency.dm

Fixes the %ETA% thing on evac shuttles

2017-04-09 20:04:53 -05:00

shuttle_ferry.dm

Late September Sync (#579)

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

shuttle_specops.dm

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

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

shuttle_supply.dm

…

shuttle.dm

Dynamic Shuttles - Code and Icon Changes

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

shuttles_multi.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00

shuttles_vr.dm

Bugfix, cleanup, & xenoarch belter access

2017-03-28 18:01:02 -04:00