Mloc-Argent ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm

2014-05-31 00:17:56 +01:00

..

xenoarchaeology

Merge remote-tracking branch 'upstream/master' into dev

2014-05-03 16:56:19 +01:00

circuitprinter.dm

Fix for acid pouring.

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

designs.dm

Made drone control consoles buildable/researchable.

2014-05-12 14:51:42 +09:30

destructive_analyzer.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

message_server.dm

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

protolathe.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

rd-readme.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 21:44:26 -07:00

rdconsole.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-05-31 00:17:56 +01:00

rdmachines.dm

…

research_shuttle.dm

Fixes circuit var for other consoles

2014-05-22 18:05:57 -04:00

research.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

server.dm

Small fixes

2014-05-22 18:19:55 -04:00