Nich 77b56f6821 Merge pull request #235 from yogstation13/upstream-merge-36840 ...

[MIRROR] Fixes singularity power output

2018-04-01 13:17:38 +02:00

..

antimatter

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

singularity

Merge pull request #235 from yogstation13/upstream-merge-36840

2018-04-01 13:17:38 +02:00

supermatter

Merge pull request #36863 from AnturK/unconciousdefine

2018-04-01 06:16:39 +01:00

tesla

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

apc.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

cable.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

cell.dm

Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)

2018-02-23 21:35:11 +02:00

floodlight.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

generator.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

gravitygenerator.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

lighting.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

monitor.dm

…

port_gen.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

power.dm

Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags (#34078)

2018-01-22 20:19:46 +01:00

powernet.dm

defines math (#33498)

2017-12-17 11:02:11 -05:00

rtg.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

smes.dm

defines math (#33498)

2017-12-17 11:02:11 -05:00

solar.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00

terminal.dm

Ports some operation to tool_act

2018-02-21 01:37:54 +03:00

tracker.dm

Adds new helper: use_tool, shakes things up in tool code (#35095)

2018-02-06 11:02:53 +01:00

turbine.dm

Merge remote-tracking branch 'tgstation/master'

2018-03-24 08:57:13 +01:00