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

Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm

2015-04-28 08:43:31 +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

Fixes #8536

2015-04-27 01:11:40 -04: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

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

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04: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

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 remote-tracking branch 'upstream/master' into dev

2015-04-28 08:43:31 +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

May fix the debug verbs showing up for non-debuggers. Probably not.

2014-09-15 01:56:38 +09:30

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