Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 ...

# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme

2018-01-04 22:44:04 -05:00

..

antimatter

Transformed the machinery processor into an StonedMC subsystem

2017-12-29 15:31:59 -05:00

cells

Finishes UFO PoI

2017-11-26 15:10:25 -05:00

fusion

RUST updates (#4325)

2017-12-03 17:35:41 -06:00

sensors

…

singularity

Works on New Blob

2017-11-29 22:35:01 -05:00

supermatter

Polaris Sync

2017-10-16 22:16:24 -04:00

apc.dm

Polaris sync

2017-12-21 04:01:07 -05:00

batteryrack.dm

Updates Tools

2017-08-03 04:49:23 -04:00

breaker_box.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

cable_ender.dm

SC Map Changes 972017

2017-09-07 17:33:34 -07:00

cable_heavyduty.dm

These are not Vorestation edits. (#4088)

2017-10-16 23:01:30 -05:00

cable_logic.dm

…

cable.dm

Adds an endless cable coil to the alien toolbelt

2017-09-20 00:26:41 -05:00

cell.dm

Swaps non-mounted recharging guns to batteries

2017-10-27 20:43:31 -05:00

fractal_reactor.dm

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

generator_type2.dm

…

generator.dm

Updates Tools

2017-08-03 04:49:23 -04:00

gravitygenerator.dm

Grammar time, again. (#4402)

2017-12-05 14:34:45 -06:00

grid_checker.dm

Grid checker is now dense and anchored

2017-11-07 23:21:03 +00:00

lighting_vr.dm

…

lighting.dm

Polaris sync

2017-12-21 04:01:07 -05:00

pacman2.dm

Moved makepowernets() into SSmachines initialization proc.

2017-12-29 15:32:06 -05:00

port_gen.dm

…

power.dm

Moved makepowernets() into SSmachines initialization proc.

2017-12-29 15:32:06 -05:00

powernet.dm

Transformed the machinery processor into an StonedMC subsystem

2017-12-29 15:31:59 -05:00

profiling.dm

…

smes_construction.dm

Removes APC destruction from hacked SMES

2017-10-24 18:11:01 -04:00

smes.dm

Updates Tools

2017-08-03 04:49:23 -04:00

solar.dm

Fixes the problem with the solar control computers where they were not fixable if they were destroyed and the glass was removed.

2017-08-25 16:42:57 -04:00

terminal.dm

…

tracker.dm

…

turbine.dm

Updates Tools

2017-08-03 04:49:23 -04:00