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

..

arms_vr.dm

Dakka Dakka

2017-06-30 22:42:08 -04:00

arms.dm

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

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

autolathe.dm

…

devices_vr.dm

Autolathe card creation

2017-04-06 18:00:18 -04:00

devices.dm

…

engineering.dm

Modernize the automatic pipe layer

2017-03-30 18:13:37 -04:00

general.dm

…

medical_vr.dm

Adds craftable autoinjector to the autolathe

2017-05-22 02:14:01 +01:00

medical.dm

Make implanters able to be created

2017-02-28 16:25:55 -05:00

tools.dm

Adds a bunch of things to cargo

2017-03-31 00:23:27 -05:00