Repede 7c6aadd829 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm

2018-03-23 20:25:18 -04:00

..

observer_listener/atom

…

Processes

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

2018-03-15 22:41:14 -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 polaris-sync-2018-03-15

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

autotransfer.dm

Fixing votes

2018-03-16 17:46:22 -04: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_yw.dm

Interserver shipping update and other changes

2017-03-03 19:13:06 -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

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

globals.dm

Implemented basic GLOB and TGS3's DMAPI

2018-02-27 18:31:13 -05: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

TGS3 test implementation

2018-02-27 23:01:28 -05:00

subsystem.dm

Bitfields do not work that way.

2018-02-05 13:13:37 -05:00

verbs.dm

Polaris sync

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

voting.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-06-18 15:35:35 -04:00