PsiOmega ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-03-13 09:23:26 +01:00

..

xenoarchaeology

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

2015-03-13 09:23:26 +01:00

circuitprinter.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

designs.dm

Much nicer syringe gun implementation

2015-02-13 23:48:35 -05:00

destructive_analyzer.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

message_server.dm

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

protolathe.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03: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

Cleans up access handling.

2015-03-02 18:55:03 +01:00

rdmachines.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

research.dm

Fixes typo in engineering research description

2015-01-10 04:25:50 +01:00

server.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00