Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

overmap

Removes unused code - old turrets

2016-02-25 15:08:30 +03:00

RandomZLevels

Post-port map fixes

2016-05-22 15:56:47 -04:00

polaris-1.dmm

Updates map.

2016-06-29 16:33:04 -04:00

polaris-2.dmm

Ports GinjaNinja32's drinks rewrite from Bay

2016-06-06 20:33:11 +01:00

polaris-3.dmm

Frame Fixes

2016-06-01 14:32:56 -04:00

polaris-4.dmm

Frame Fixes

2016-06-01 14:32:56 -04:00

polaris-5.dmm

Merge pull request #1883 from Yoshax/drinks

2016-06-10 23:08:41 -04:00

virgo-1.dmm

Fixes issues with update:

2016-06-14 15:01:37 -04:00

virgo-2.dmm

Fixes issues with update:

2016-06-14 15:01:37 -04:00

virgo-3.dmm

Map Sync

2016-06-09 00:26:31 -04:00

virgo-4.dmm

Map Sync

2016-06-09 00:26:31 -04:00

virgo-5.dmm

Fixes issues with update:

2016-06-14 15:01:37 -04:00

virgo-6.dmm

Map cleanup

2016-06-02 22:19:24 -04:00