Joan Lung 179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur ...

Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi

2016-09-12 17:14:39 -04:00

..

designs

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

xenobiology

Fixes some potential weird faction bugs

2016-09-02 16:51:26 -04:00

circuitprinter.dm

improvements and fixes.

2016-08-10 21:29:11 -07:00

designs.dm

CHEMICAL GAS & Reworks

2016-08-31 19:35:39 -07:00

destructive_analyzer.dm

Bug and runtime fixes

2016-05-25 21:43:19 +03:00

experimentor.dm

Merge pull request #18335 from Fox-McCloud/experimental

2016-06-08 13:14:57 +02:00

message_server.dm

…

protolathe.dm

Finishes id computer

2016-08-09 22:55:07 -07:00

rd-readme.dm

Removing reliability

2016-05-12 02:43:18 +03:00

rdconsole.dm

Removes reagent gas, Misc changes, REAGENT CODE OPTIMIZATION

2016-09-02 15:04:51 -07:00

rdmachines.dm

R&D machinery refactor (#18295)

2016-06-08 17:18:22 +12:00

research.dm

Added technology and design disks that can hold more than one entry.

2016-08-24 18:30:07 -07:00

server.dm

Removing reliability

2016-05-12 02:43:18 +03:00

stock_parts.dm

Moves all beam icon states to beams.dmi

2016-09-10 13:09:44 -04:00