Neerti 2daac2d647 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/4/2016_emp_tweaks ...

# Conflicts resolved:
#	code/modules/mob/living/carbon/human/human_defense.dm

2016-02-06 01:55:02 -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 all get_base_turf usages to get_base_turf_by_area.

2015-12-05 04:24:17 +00:00

apc.dm

Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate

2016-02-06 14:30:51 +10:30

batteryrack.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

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

Cleaning up post-merge.

2016-01-22 01:22:49 +10:30

cell.dm

EMP tweaks/fixes

2016-02-04 09:51:25 -05:00

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

Merge resolution with master.

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

gravitygenerator.dm

remove the sub-area system

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

lighting.dm

1.4.5- Fixes and Ecofriendly Lighting Tweaks

2016-01-31 21:06:05 -08: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

Ghosts can now view any object with a NanoUI interface.

2015-12-07 02:35:33 -05:00

solar.dm

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

terminal.dm

Fixes #715

2016-01-14 01:08:21 +10:30

tracker.dm

Major sheet and material refactor.

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

turbine.dm

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

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