PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo ...

Conflicts:
	code/modules/power/solar.dm

2014-10-24 13:32:36 +02: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

Merge branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02:00

apc.dm

Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.

2014-10-20 19:18:27 +02:00

batteryrack.dm

Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.

2014-10-20 19:18:27 +02:00

breaker_box.dm

Adds diagonal cable check on breaker box state change.

2014-10-12 12:55:19 +02:00

cable_heavyduty.dm

Cables are now stacks

2014-08-25 18:54:35 +04:00

cable_logic.dm

Fixes #6121

2014-09-04 05:02:03 +01:00

cable.dm

Fixes bad tabbing, only evident when placing Z-crossing cables.

2014-10-14 14:14:46 +02:00

cell.dm

Fixes chargers being a magical source of charge

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

engine.dm

…

fractal_reactor.dm

Basically ripped over /tg/'s powernet and cable code into our own codebase.

2014-10-13 17:13:04 +02:00

generator_type2.dm

removed debug output for type 2 TEGs

2013-03-05 17:06:43 +10:00

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 branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

pacman2.dm

Cables are now stacks

2014-08-25 18:54:35 +04:00

port_gen.dm

Basically ripped over /tg/'s powernet and cable code into our own codebase.

2014-10-13 17:13:04 +02:00

power_monitor.dm

Allows heater/freezer construction dir to be set

2014-09-07 17:07:53 -04:00

power.dm

Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.

2014-10-20 19:18:27 +02:00

powernet.dm

Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.

2014-10-20 19:18:27 +02:00

profiling.dm

May fix the debug verbs showing up for non-debuggers. Probably not.

2014-09-15 01:56:38 +09:30

smes_construction.dm

Attempt to resolve merge conflict. I hope i won't break something.

2014-09-12 20:07:21 +02:00

smes.dm

Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.

2014-10-20 19:18:27 +02:00

solar.dm

Merge branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02:00

terminal.dm

Basically ripped over /tg/'s powernet and cable code into our own codebase.

2014-10-13 17:13:04 +02:00

tracker.dm

/tg/'s solar code with a fix for the solar control computer not refreshing on user input.

2014-10-13 17:37:18 +02:00

turbine.dm

Basically ripped over /tg/'s powernet and cable code into our own codebase.

2014-10-13 17:13:04 +02:00