mwerezak 5ca36fcadb Merge branch 'dev' into power-net ...

Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl

2014-07-16 16:14:52 -04:00

..

antimatter

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

singularity

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

apc.dm

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

2014-07-16 19:30:41 +09:30

batteryrack.dm

Let's test this rebase thing.

2014-06-14 15:20:25 +01:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Fixes incorrect cable coil colours

2014-06-23 21:44:51 +12:00

cell.dm

Fixes chargers being a magical source of charge

2014-07-12 15:44:21 -04:00

engine.dm

…

generator_type2.dm

…

generator.dm

Quick fix to TEG

2014-05-20 07:12:28 +04:00

gravitygenerator.dm

World loops 2: Electric Boogaloo.

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

lighting.dm

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

2014-06-23 20:57:47 +01:00

pacman2.dm

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

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

port_gen.dm

More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.

2014-06-08 01:39:49 +09:30

power.dm

Removed my debug lines.

2014-03-08 03:55:22 -06:00

smes.dm

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

solar.dm

Changes most viable, used entries of plasma with phoron.

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

switch.dm

…

terminal.dm

…

tracker.dm

…

turbine.dm

Merge pull request #5331 from UristMcKerman/pipeturbine

2014-06-24 13:08:11 +04:00