PsiOmega 0731badf87 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/modules/power/smes.dm
	code/modules/power/smes_construction.dm
	maps/tgstation2.dmm

2014-11-30 10:54:15 +01:00

..

antimatter

All the relevant examine changes.

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

sensors

Adds mwerezak's suggestions

2014-11-20 16:24:26 +01:00

singularity

Merge pull request #7142 from PsiOmegaDelta/Singularity

2014-11-26 22:08:48 +01:00

apc.dm

Merge resolution.

2014-11-22 07:31:44 +10:30

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

…

cable_logic.dm

Fixes #6121

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

cable.dm

Merge resolution.

2014-11-22 07:31:44 +10:30

cell.dm

Moved everything to a module-based hardsuit system.

2014-11-14 22:57:26 +10:30

engine.dm

Removed attack_paw, attack_animal and attack_slime.

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

fractal_reactor.dm

Fractal Energy Reactor can now be mapped in.

2014-11-28 21:35:02 +01:00

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

Removed attack_paw, attack_animal and attack_slime.

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

lighting.dm

Fixes the light power consumption the new /tg/ style.

2014-11-16 11:13:27 +01:00

pacman2.dm

All the relevant examine changes.

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

port_gen.dm

Removed attack_paw, attack_animal and attack_slime.

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

power.dm

Powernet Update Fix

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

powernet.dm

Modifications to sensors code

2014-11-12 14:54:56 +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/master' into dev

2014-11-30 10:54:15 +01:00

smes.dm

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

2014-11-30 10:54:15 +01:00

solar.dm

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

2014-11-19 14:40:18 +01: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