VOREStation

mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00

Files

Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme

2018-01-04 22:44:04 -05:00

assistance

Syndicate Borgs II, Return of the Salt

2017-10-20 13:01:45 -04:00

devices

Adds rings

2017-10-15 15:05:52 -05:00

spells

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

catalog.dm

Technomancer changes