Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm

2017-06-01 17:27:00 -04:00

..

circuitprinter.dm

Sheet loaders can feed protolathes and circuit imprinters

2016-12-21 16:47:26 -08:00

designs_vr.dm

Adds the Algae Oxygen Generator

2017-05-03 01:54:55 -04:00

designs.dm

Finishes fixing ammo inconsistencies

2017-05-27 04:39:49 -04:00

destructive_analyzer.dm

…

mechfab_designs.dm

…

message_server.dm

Antag Radio changes

2017-03-25 14:19:57 -05:00

prosfab_designs.dm

Fix up a few more things with synth printing

2017-04-09 23:56:13 -04:00

protolathe.dm

Finally fixes the autolathe/protolate lid animations.

2017-02-24 21:30:57 -05:00

rd-readme.dm

…

rdconsole.dm

…

rdmachines.dm

Eris Machines

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

research.dm

Makes Circuits Make Their Own Research Designs

2016-12-30 02:41:11 -05:00

server.dm

Eris R&D Server Icons

2017-04-23 19:02:10 -04:00