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

..

circuitprinter.dm

Fixes the circuit printer and protolathe's material cost check as well. Updates this local to match Master.

2017-10-16 13:12:08 -07:00

designs_vr.dm

Adds plasma research outpost.

2017-09-29 02:28:43 -04:00

designs.dm

K.

2017-12-06 16:14:55 -05:00

destructive_analyzer.dm

…

mechfab_designs.dm

Adds the disabled mech tools. (#4445)

2017-12-29 21:44:04 -08:00

message_server.dm

SC Stupid Sized Map Update

2017-12-24 07:04:34 -08:00

prosfab_designs.dm

Polaris sync

2017-12-21 04:01:07 -05:00

protolathe.dm

Fixes the circuit printer and protolathe's material cost check as well. Updates this local to match Master.

2017-10-16 13:12:08 -07:00

rd-readme.dm

…

rdconsole.dm

Proto/Autolathe lag fix

2017-10-27 04:00:44 -04:00

rdmachines.dm

Eris Machines

2017-04-23 18:30:39 -04:00

research.dm

Even More Circuit Changes

2017-08-01 16:13:27 -04:00

server.dm

Polaris sync

2017-08-06 19:07:17 -04:00