Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 ...

# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme

2018-02-07 19:30:50 -05:00

..

antimatter

Transformed the machinery processor into an StonedMC subsystem

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

cells

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

fusion

RUST additions and updates, Modular guns, and Lead. (#4667)

2018-02-04 18:04:28 -06:00

sensors

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

singularity

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

supermatter

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

tesla

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05: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

Add circuit and research design to allow constructing breaker boxes in game.

2018-01-21 20:36:44 -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

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

cell.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06: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

Fixes lights for macros, hopefully.

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

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

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

power.dm

Implements the Tesla engine and supporting features (#4539)

2018-01-19 14:56:08 -06:00

powernet.dm

Transformed the machinery processor into an StonedMC subsystem

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

profiling.dm

…

smes_construction.dm

POI Tweaks (#4645)

2018-01-29 23:42:57 -06:00

smes.dm

Updates Tools

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

solar.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05: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

Updates Tools

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