Leshana 33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml

2018-05-10 13:48:20 -04:00

..

observer_listener/atom

…

Processes

Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

2018-05-10 13:48:20 -04: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 aro-sync-04252018

2018-04-25 17:23:33 -04: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

Adds cap on PTO

2018-02-02 18:37:50 -05:00

configuration.dm

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

2018-03-15 22:41:14 -04:00

controller.dm

Ports /tg's StonedMC Subsystem from Baystation12

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

emergency_shuttle_controller.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07: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

…

master_controller.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

master.dm

Random micro optimization to the mc I thought of while looking at something else

2018-04-20 17:55:08 -04:00

subsystem.dm

Merge pull request #5200 from VOREStation/vplk-stonedmc-sync

2018-04-24 15:20:57 -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