Ccomp5950 56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -05:00

..

xenoarchaeology

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

circuitprinter.dm

Fix for acid pouring.

2013-10-27 21:56:08 +03:00

designs.dm

Laser scalpels are now producable

2014-02-26 15:23:08 -05:00

destructive_analyzer.dm

Fixed destructive analyzer failure messages.

2014-01-08 19:27:27 +00:00

message_server.dm

…

protolathe.dm

Fix for #3254.

2013-07-06 16:50:01 +03:00

rd-readme.dm

…

rdconsole.dm

Removed R&D lockboxes.

2013-12-22 13:29:28 -06:00

rdmachines.dm

…

research_shuttle.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

research.dm

…

server.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00