skull132 efee411ad7 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/modular_computers/computers/modular_computer/damage.dm

2017-05-20 19:18:35 +03:00

..

sheets

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

tiles

Fixes subcategories of floor tiles not being placable

2015-12-11 11:08:36 +01:00

matter_synth.dm

Replaces Construction module

2016-01-16 12:38:02 +01:00

medical.dm

More bug fixes (#2305)

2017-05-20 18:41:26 +03:00

nanopaste.dm

Baymerge fixes and custom items tweaks (#1515)

2017-01-11 23:01:43 +02:00

rods.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

stack.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

telecrystal.dm

Makes it possible to convert uplink TCs into physical form.

2016-01-11 16:58:42 +01:00