Repede 26d570b470 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/multiz/pipes.dm
#	config/custom_items.txt

2018-03-14 18:23:53 -04:00

..

antimatter

…

cells

POLARIS: FBP backup battery cells for survival purposes

2018-02-24 14:14:21 -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

VS: Announce tes/singuloose in adminchat

2018-03-11 21:33:31 -04:00

supermatter

POLARIS: Log more engine info

2018-03-11 21:33:31 -04:00

tesla

POLARIS: Log more engine info

2018-03-11 21:33:31 -04:00

apc.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

2018-02-17 00:35:29 -05:00

batteryrack.dm

…

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

…

cable_heavyduty.dm

…

cable_logic.dm

…

cable.dm

POLARIS: Moves most boxes to use starts_with

2018-02-18 13:03:05 -06:00

cell.dm

Replaces most of the gender macros. (#4681)

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

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

…

gravitygenerator.dm

…

grid_checker.dm

…

lighting_vr.dm

…

lighting.dm

All my changes so far.

2018-02-02 04:57:01 -05:00

lightswitch_vr.dm

Make light switches constructable

2018-02-14 21:26:00 -05:00

pacman2.dm

…

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

…

profiling.dm

…

smes_construction.dm

SMES tweaks (#4793)

2018-02-12 20:39:58 -06:00

smes.dm

POLARIS: Log more engine info

2018-03-11 21:33:31 -04:00

solar.dm

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

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

terminal.dm

…

tracker.dm

…

turbine.dm

Make gas turbine constructable and operational

2018-02-18 21:21:50 -05:00