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

..

PDA

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

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

radio

Designed to replace AI's intercoms. Integrated headset-like device which has access to all department frequencies. Also let's AIs use radio on intellicard.

2014-07-16 00:54:54 +02:00

aicard.dm

Designed to replace AI's intercoms. Integrated headset-like device which has access to all department frequencies. Also let's AIs use radio on intellicard.

2014-07-16 00:54:54 +02:00

chameleonproj.dm

Fixes chameleon projector

2014-01-08 19:43:27 +00:00

debugger.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

flash.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

flashlight.dm

Merge with dev.

2014-06-12 01:14:40 +09:30

lightreplacer.dm

…

megaphone.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

modkit.dm

Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits.

2014-05-27 01:18:07 +09:30

multitool.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

paicard.dm

Added missing header to pAI Request Module

2014-04-28 16:56:39 -07:00

pipe_painter.dm

Pipe rendering rewrite

2014-07-14 19:12:22 +12:00

powersink.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

scanners.dm

Merge branch 'dev' into power-net

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

suit_cooling.dm

Improves suit cooler

2014-06-29 19:10:00 -04:00

taperecorder.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

traitordevices.dm

…

transfer_valve.dm

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

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

uplinks.dm

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

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

violin.dm

…

whistle.dm

Change hailer to hearable message.

2013-08-31 22:11:24 +01:00