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

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -04:00

..

Cryogaïa.dm

All my changes so far.

2018-02-02 04:57:01 -05:00

planet.dm

Replaces set_light with direct update_lumcount for planet suns.

2018-04-18 21:54:58 -04:00

sif.dm

Hail is less omnicidal

2018-02-28 14:45:10 -06:00

time.dm

…

weather.dm

Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)""

2018-06-01 20:35:28 -04:00