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

# Conflicts:
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt

2017-09-23 11:40:55 -04:00

..

__defines

HOTFIX

2017-09-21 20:26:48 -04:00

_compatibility/509

…

_helpers

Polaris sync

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

_onclick

HOTFIX

2017-09-21 20:26:48 -04:00

ATMOSPHERICS

Polaris sync

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

controllers

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

2017-09-21 18:37:11 -04:00

datums

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

2017-09-23 11:40:55 -04:00

defines

HOTFIX

2017-09-21 20:26:48 -04:00

game

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

2017-09-23 11:40:55 -04:00

js

…

modules

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

2017-09-23 11:40:55 -04:00

unit_tests

…

ZAS

Polaris sync

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

_macros.dm

work

2017-09-04 21:52:47 -04:00

_unit_tests.dm

…

global_vr.dm

…

global_yw.dm

Added back crowbars to Medihound, Added defibs to medhound, changed beaker to a large one.

2017-08-29 03:15:28 +01:00

global.dm

…

hub.dm

…

names.dm

…

stylesheet.dm

HOTFIX

2017-09-21 20:26:48 -04:00

world.dm

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

2017-09-21 18:37:11 -04:00