Repede 2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-23 17:53:13 -04:00

..

Cryogaïa.dm

All my changes so far.

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

planet.dm

Move planets to SSplanets

2018-06-15 19:05:38 -04:00

sif.dm

Weather is shorter, hail is less deadly.

2018-06-16 14:02:09 -04:00

time.dm

Make planets more generic

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

weather.dm

Weather is shorter, hail is less deadly.

2018-06-16 14:02:09 -04:00