Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

xenoarchaeology

Removes pay bugfix

2016-05-23 14:06:06 -04:00

circuitprinter.dm

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

designs_vr.dm

Nerfs the costs to make them and things required to make them

2016-05-18 17:32:34 -04:00

designs.dm

Fix copy/paste error duplicating definition

2016-05-25 23:12:56 -04:00

destructive_analyzer.dm

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

mechfab_designs.dm

Adds unit tests

2016-03-29 17:42:22 +03:00

message_server.dm

…

protolathe.dm

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

rd-readme.dm

…

rdconsole.dm

Resolve problem with robot destructive analyzer

2016-03-31 16:10:07 -04:00

rdmachines.dm

Removes copypaste

2016-01-18 16:04:01 +03:00

research.dm

Corrects issue in cherrypicking.

2016-03-31 16:29:48 -04:00

server.dm

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00