Leshana f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 ...

# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme

2017-03-06 20:58:38 -05: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

Singulo should be more stable now, produce power earlier

2016-11-22 22:00:43 -06:00

apc.dm

Further tweaks to Vox and their toys

2017-02-01 21:43:21 -06: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

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05: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_vr.dm

Fixes lights for macros, hopefully.

2016-12-29 02:05:17 -05:00

lighting.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

2017-02-14 20:29:57 -05:00

pacman2.dm

…

port_gen.dm

Fix construction and deconstrution of PACMANs

2017-02-22 10:32:27 -05:00

power.dm

Robots should not be shocked by wires/machines

2016-11-12 21:35:55 -06:00

powernet.dm

…

profiling.dm

…

smes_construction.dm

Polaris Sync October 9th (#633)

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

smes.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05: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

…