Kelshark c048a8ea8b Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

2018-02-02 19:25:51 -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

Makes R-UST machines deconstructable, some more fixes (#4634)

2018-01-30 03:16:16 -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 branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01

2018-02-01 23:55:47 -05:00

supermatter

Various and sundry admin messages

2018-01-06 19:15:54 -05:00

tesla

Add checks to allow Tesla to fully dissipate once it runs out of energy.

2018-01-21 22:48:45 -05:00

apc.dm

Polaris sync

2017-12-21 04:01:07 -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

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

Makes alien wire more useful

2018-01-22 15:53:44 -06:00

cell.dm

Swaps non-mounted recharging guns to batteries

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

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

…

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

All my changes so far.

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

pacman2.dm

Moved makepowernets() into SSmachines initialization proc.

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

port_gen.dm

…

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

…

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

…