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

Conflicts:
	code/game/objects/items/weapons/power_cells.dm

2015-05-22 08:26:13 +02:00

..

antimatter

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

rust

Merge pull request #8946 from Zuhayr/miningstuff

2015-05-12 13:13:31 +03:00

sensors

mood lighting for computers

2015-05-10 20:54:29 +01:00

singularity

Dev merge.

2015-05-11 18:45:14 +09:30

apc.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

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

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

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

cell.dm

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

2015-05-22 08:26:13 +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

remove the sub-area system

2015-05-10 17:06:29 +01:00

lighting.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +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

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

power.dm

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

2015-05-22 08:26:13 +02:00

powernet.dm

remove the sub-area system

2015-05-10 17:06:29 +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

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

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

terminal.dm

Terminals, scrubbers, airlocks, and alarms get a Destroy() review.

2015-05-12 08:16:30 +02:00

tracker.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

turbine.dm

Renamed shards, katanas, claymores.

2015-05-16 20:36:33 +09:30