Zuhayr bc50ba5166 Merge resolution.

2015-05-11 11:47:24 +09:30

..

antimatter

Merge resolution.

2015-05-11 11:47:24 +09:30

rust

Merge resolution.

2015-05-11 11:47:24 +09:30

sensors

Fixes #8536

2015-04-27 01:11:40 -04:00

singularity

Merge resolution.

2015-05-11 11:47:24 +09:30

apc.dm

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

2015-04-24 17:13:37 +02:00

batteryrack.dm

Updates code based off of GinjaNinja's Feedback

2015-05-05 17:16:10 +02:00

breaker_box.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

cell.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

engine.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

fractal_reactor.dm

Fractal Energy Reactor can now be mapped in.

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

generator_type2.dm

…

generator.dm

Adds a bunch of prettiness to the TEG, fixes a runtime.

2015-03-04 09:13:05 -05:00

gravitygenerator.dm

Removed attack_paw, attack_animal and attack_slime.

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

lighting.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

pacman2.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

port_gen.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

power.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

powernet.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

profiling.dm

…

smes_construction.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

smes.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

solar.dm

initialize() should now always be called, be it on game starting up or object being created after game start.

2015-04-30 19:28:35 +02:00

terminal.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

tracker.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

turbine.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00