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

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-01-24 19:52:12 -05:00

..

__defines

Merge pull request #2809 from VOREStation/vplk-multi-engine

2018-01-21 17:48:45 -05:00

_compatibility/509

…

_helpers

Merge pull request #2809 from VOREStation/vplk-multi-engine

2018-01-21 17:48:45 -05:00

_onclick

Update VOREStation specific code to use merged in features.

2018-01-19 18:15:47 -05:00

ATMOSPHERICS

Fixes #2820 - Vent pumps shutting down after some template loads

2018-01-22 19:21:56 -05:00

controllers

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

2018-01-24 19:52:12 -05:00

datums

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

2018-01-24 19:52:12 -05:00

defines

Compensated for addition of Planetary Department to PDAs.

2018-01-19 21:09:02 -05:00

game

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

2018-01-24 19:52:12 -05:00

js

…

modules

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

2018-01-24 19:52:12 -05:00

unit_tests

Move unit test except areas into tether_defines where they should be.

2018-01-17 00:31:02 -05:00

ZAS

Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing"""""""""

2018-01-16 17:35:43 -06:00

_macros.dm

Multiple loadout slots (#4530)

2018-01-14 14:47:47 -06:00

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global_yw.dm

…

global.dm

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

2018-01-24 19:52:12 -05:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

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

2018-01-24 19:52:12 -05:00