Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 ...

# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

2018-01-19 17:52:25 -05:00

..

observer_listener/atom

Ports event system from Bay

2016-06-01 22:05:04 +01:00

Processes

Polaris sync

2017-12-21 04:01:07 -05:00

ProcessScheduler

Ports https://github.com/tgstation/tgstation/pull/30184

2017-12-27 19:10:15 -05:00

subsystems

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

2018-01-19 17:52:25 -05:00

autotransfer.dm

Clarify extend vote wording

2017-12-27 18:19:18 -05:00

communications.dm

SC Stupid Sized Map Update

2017-12-24 07:04:34 -08:00

configuration_vr.dm

Add discord integration for faxes

2016-11-04 21:58:25 -04:00

configuration.dm

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

controller.dm

Ports /tg's StonedMC Subsystem from Baystation12

2017-05-30 21:00:37 -04:00

emergency_shuttle_controller.dm

Port's Bay's Shuttle Cleanup

2017-06-11 11:45:31 -04:00

failsafe.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

hooks-defs.dm

Adds Supply Shuttle Hook

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

hooks.dm

Fixes issues travis found

2016-03-11 11:59:51 +03:00

master_controller.dm

Prepare Atmospherics Machinery for SSatoms (#4501)

2018-01-06 10:52:56 -06:00

master.dm

Ports /tg controller optimizations

2017-12-27 21:19:55 -05:00

shuttle_controller.dm

Web Shuttle Update

2018-01-14 14:03:58 -05:00

subsystem.dm

Ports /tg controller optimizations

2017-12-27 21:19:55 -05:00

verbs.dm

Polaris sync

2017-09-15 21:17:34 -04:00

voting.dm

More and more Destroy() cleanups all across the board - Return qdel hints.

2017-06-10 22:41:51 -04:00