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

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi

2014-10-15 22:13:44 +01:00

..

sheets

donut boxes now update their icon to properly reflect their contents

2014-10-05 19:24:30 +01:00

tiles

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

medical.dm

Fixes advanced trauma kits claiming to disinfect but not doing so

2014-07-08 18:49:51 -04:00

nanopaste.dm

Surgery Update

2013-11-14 13:08:31 -05:00

rods.dm

fixes building more than 1 grille per turf

2014-08-16 22:48:13 +02:00

stack.dm

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

2014-10-15 22:13:44 +01:00