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

# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi

2018-02-24 22:51:59 -05:00

..

Cryogaïa.dm

All my changes so far.

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

planet.dm

Read github PR for details.

2017-10-10 00:48:27 -04:00

sif.dm

Adds umbrellas sprites courtesy of schnayy

2018-02-17 13:30:50 -08:00

time.dm

Make planets more generic

2017-04-14 21:36:48 -04:00

weather.dm

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

2018-02-17 00:35:29 -05:00