Chinsky ada2ba9a2f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into color ...

Conflicts:
	code/modules/power/cable.dm
	icons/obj/power_cond_red.dmi

2014-01-27 02:27:27 +04:00

..

antimatter

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

singularity

Fixed rad collector toxin drain bug

2014-01-20 16:16:02 +13:00

apc.dm

APC NanoUI

2014-01-12 23:11:49 +00:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

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

2014-01-27 02:27:27 +04:00

cell.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

engine.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

…

lighting.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

pacman2.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

port_gen.dm

…

power.dm

Mass correction of controler to controller.

2014-01-25 03:15:13 +10:30

smes.dm

SMES fix, AI's can now use them.

2014-01-19 21:26:15 -06:00

solar.dm

…

switch.dm

…

terminal.dm

…

tracker.dm

…

turbine.dm

…