PsiOmega 0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC ...

Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm

2014-11-11 14:13:02 +01:00

..

antimatter

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

singularity

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

apc.dm

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

2014-11-11 14:13:02 +01:00

batteryrack.dm

Ports more of /tg/'s powernet code.

2014-10-29 14:01:35 +01:00

breaker_box.dm

Compile issues with the merge. PDA tapping may be broken for pAIs.

2014-11-10 13:17:17 +10:30

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

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

2014-11-11 14:13:02 +01:00

cell.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01: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

…

generator.dm

Quick fix to TEG

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

gravitygenerator.dm

…

lighting.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

pacman2.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

port_gen.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

power_monitor.dm

Allows heater/freezer construction dir to be set

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

power.dm

Powernet Update Fix

2014-11-05 10:35:17 +01:00

powernet.dm

Ports more of /tg/'s powernet code.

2014-10-29 14:01:35 +01: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

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

2014-11-11 14:13:02 +01:00

smes.dm

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

2014-11-11 14:13:02 +01:00

solar.dm

Merge branch 'dev' into PowerTwo

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

terminal.dm

Merge conflict resolution.

2014-11-10 13:00:06 +10:30

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

Merge pull request #6651 from PsiOmegaDelta/PowerTwo

2014-10-26 23:54:31 +03:00