Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge ...

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

2015-11-06 17:41:18 -05:00

..

antimatter

Updates blob

2015-10-05 18:10:16 +03:00

sensors

Fixes computers with custom icon states.

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

singularity

Updates blob

2015-10-05 18:10:16 +03:00

apc.dm

Updates blob

2015-10-05 18:10:16 +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

Multi-Z.

2015-08-30 14:15:20 -07:00

cell.dm

Updates blob

2015-10-05 18:10:16 +03:00

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 branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

2015-11-06 17:41:18 -05:00

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

Destroy tweaks.

2015-09-25 10:44:23 +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

Improves powernet destruction.

2015-09-16 08:00:22 +02:00

profiling.dm

…

smes_construction.dm

Destroy tweaks.

2015-09-25 10:44:23 +02:00

smes.dm

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

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

solar.dm

Merge pull request #11397 from Baystation12/dev-freeze

2015-10-31 16:43:02 +01: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