Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

antimatter

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

sensors

Fixes power monitor computer screens

2016-06-03 22:10:52 -04:00

singularity

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

apc.dm

Adds the new Grid Check event to rotation.

2016-10-21 12:47:57 -04:00

batteryrack.dm

Buildables v1.2 (#1517)

2016-05-03 22:18:12 +01:00

breaker_box.dm

…

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

cell.dm

EMP tweaks/fixes

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

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

Adds the new Grid Check event to rotation.

2016-10-21 12:47:57 -04:00

gravitygenerator.dm

…

grid_checker.dm

Adds the new Grid Check event to rotation.

2016-10-21 12:47:57 -04:00

lighting.dm

Fixes lights overlapping big mobs. Sort of.

2016-10-16 16:42:39 -04:00

pacman2.dm

…

port_gen.dm

Construction Update

2016-03-25 16:02:36 -04:00

power.dm

Adds the new Grid Check event to rotation.

2016-10-21 12:47:57 -04:00

powernet.dm

Improves powernet destruction.

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

profiling.dm

…

smes_construction.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

smes.dm

Adds the new Grid Check event to rotation.

2016-10-21 12:47:57 -04:00

solar.dm

Fix solar assembly behavior while in inventory

2016-10-10 03:03:48 -07:00

terminal.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

tracker.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

turbine.dm

…