PsiOmega 7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm

2015-02-27 09:06:48 +01:00

..

antimatter

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

rust

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00

sensors

The AI now has a personal power monitor interface.

2015-02-16 15:12:23 +01:00

singularity

Alarm centralization completion

2015-02-23 11:23:23 +01:00

apc.dm

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

2015-02-27 09:06:48 +01:00

batteryrack.dm

Removed unused substation batteryrack code.

2014-12-17 14:31:57 +01:00

breaker_box.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Merge pull request #8175 from Kelenius/ofBorgsAndSynths

2015-02-21 11:43:39 +03:00

cell.dm

Generalizes emp energy weapon drain to power cells

2015-02-12 01:37:41 -05:00

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

Some TEG refactoring and UI improvements

2015-02-13 18:34:48 +08:00

gravitygenerator.dm

Removed attack_paw, attack_animal and attack_slime.

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

lighting.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

pacman2.dm

All the relevant examine changes.

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

port_gen.dm

Replaces text expressions with macros

2015-02-12 01:55:12 -05:00

power.dm

Fixes machines being usable after a power failure

2015-02-11 23:28:53 -05:00

powernet.dm

Fixes two powernet related issues:

2015-01-20 21:12:52 +01:00

profiling.dm

…

smes_construction.dm

The AI now has a personal power monitor interface.

2015-02-16 15:12:23 +01:00

smes.dm

Merge master into dev.

2015-02-12 23:01:08 +10:30

solar.dm

Fixes (at least some) of the recursive power-drain crash issues.

2014-12-14 14:44:53 +10:30

terminal.dm

Merge conflict resolution.

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

tracker.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

turbine.dm

Updates references

2014-12-27 00:03:20 +01:00