PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

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

..

antimatter

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

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

rust

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

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

sensors

The AI now has a personal power monitor interface.

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

singularity

Adds Destroys.

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

apc.dm

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

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

batteryrack.dm

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

2015-04-24 09:59:05 +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

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

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

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

…

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

…

lighting.dm

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

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

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

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

2015-04-24 09:59:05 +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