Amunak d28cb57f79 Merges upstream/dev to ref, resolves merge conflicts

2014-12-18 03:44:28 +01:00

..

antimatter

All the relevant examine changes.

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

sensors

Attempt to normalize computer and circuit board names and their research names.

2014-12-10 20:37:18 +01:00

singularity

Fixed capitalization of most game items

2014-12-18 03:10:36 +01:00

apc.dm

Fixes #7354

2014-12-11 00:41:44 -05:00

batteryrack.dm

Removed unused substation batteryrack code.

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

breaker_box.dm

Adds ability to modify RCON tags on SMES units and breaker boxes.

2014-12-08 06:10:47 +01: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

Revert updateicon changes

2014-12-13 00:10:30 +13:00

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

refactor 'dir = ' into 'set_dir()'

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

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

Corrects names of computers, code formatting, updated computer descriptions.

2014-12-14 05:00:38 +01:00

smes.dm

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

2014-12-12 09:04:09 +01:00

solar.dm

refactor 'dir = ' into 'set_dir()'

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

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

Merge pull request #6651 from PsiOmegaDelta/PowerTwo

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