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

# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-04-20 09:03:58 -04:00

..

__defines

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

2018-04-20 09:03:58 -04:00

_compatibility/509

…

_helpers

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

2018-04-20 09:03:58 -04:00

_onclick

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

ATMOSPHERICS

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

2018-04-06 15:40:06 -04:00

controllers

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

2018-04-20 09:03:58 -04:00

datums

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

2018-04-20 09:03:58 -04:00

defines

…

game

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

2018-04-20 09:03:58 -04:00

js

…

modules

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

2018-04-20 09:03:58 -04:00

unit_tests

…

ZAS

…

_away_mission_tests.dm

…

_macros_vr.dm

Lazily implements taur riding

2018-04-12 15:10:17 -04:00

_macros.dm

…

_map_tests.dm

…

_unit_tests.dm

…

global_vr.dm

…

global_yw.dm

…

global.dm

Initial cleanup/changes

2018-04-02 16:36:04 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

…