PsiOmega d001489d14 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/modules/admin/topic.dm

2015-08-21 18:59:19 +02:00

..

antimatter

…

sensors

Fixes computers with custom icon states.

2015-08-21 09:50:39 +02:00

singularity

Moves flags values to item_flags var

2015-08-18 17:18:25 -04:00

apc.dm

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

batteryrack.dm

…

breaker_box.dm

Compilation fixes.

2015-06-16 11:03:25 +02:00

cable_heavyduty.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

cable_logic.dm

…

cable.dm

Added more colour defines, added functionality to the floor painter.

2015-08-18 13:41:04 -07:00

cell.dm

…

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

Merge resolution with master.

2015-06-28 06:02:52 +09:30

gravitygenerator.dm

…

lighting.dm

Merge pull request #10239 from mwerezak/lighting-fix

2015-07-19 20:13:55 +09:30

pacman2.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

port_gen.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

power.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

powernet.dm

…

profiling.dm

…

smes_construction.dm

Compilation fixes.

2015-06-16 11:03:25 +02:00

smes.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-20 14:09:07 +02:00

solar.dm

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

2015-08-08 15:34:51 +02:00

terminal.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

tracker.dm

…

turbine.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-20 14:09:07 +02:00