mwerezak c46904a3b6 Merge remote-tracking branch 'upstream/dev' into power-net ...

Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/pipes.dm

2014-07-18 15:02:07 -04:00

..

xenoarchaeology

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

2014-07-18 13:15:30 +00:00

circuitprinter.dm

Fix for acid pouring.

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

designs.dm

Made spawning with a loyalty implant compliant to configuration...

2014-07-14 17:21:11 -04:00

destructive_analyzer.dm

Changes most viable, used entries of plasma with phoron.

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

message_server.dm

Tweaks for spam #2

2014-05-29 16:05:00 +04:00

protolathe.dm

Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.

2014-06-08 00:52:20 +09:30

rd-readme.dm

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

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

rdconsole.dm

Fixed dev bug with destructive analyzer and null matter lists.

2014-06-29 10:25:03 +09:30

rdmachines.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

research.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

server.dm

R&D Server heat production and power usage

2014-07-11 15:14:54 -04:00