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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	maps/virgo-1.dmm

2017-01-10 21:00:47 -05:00

..

grav_pull_vr.dm

…

holder_micro_vr.dm

Try to fix microBgone bug

2016-10-22 22:27:45 -04:00

resize_vr.dm

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

2017-01-10 21:00:47 -05:00

sizegun_vr.dm

…