LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 ...

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

2018-05-20 23:11:16 -05:00

..

antimatter

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

singularity

Readds missing nuked narsie cinematic. (#37584)

2018-05-01 11:05:16 -05:00

supermatter

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

tesla

runtime fix

2018-05-06 20:17:15 -07:00

apc.dm

Merge pull request #37648 from vuonojenmustaturska/apcunsmash

2018-05-06 16:37:04 -05:00

cable.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00

cell.dm

[MIRROR] Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#5673)

2018-02-23 17:42:24 -06:00

floodlight.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

generator.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

gravitygenerator.dm

Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)

2018-04-18 09:33:31 -05:00

lighting.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

monitor.dm

…

port_gen.dm

Fixed stacks sometimes having the wrong amount if created on another stack

2018-05-11 17:30:32 -05:00

power.dm

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

powernet.dm

…

rtg.dm

Refactors and fixes RPEDs

2018-04-27 13:13:37 -05:00

smes.dm

Refactors and fixes RPEDs

2018-04-27 13:13:37 -05:00

solar.dm

Fixed stacks sometimes having the wrong amount if created on another stack

2018-05-11 17:30:32 -05:00

terminal.dm

[MIRROR] Ports more operations to "tool_act" (#5718)

2018-02-27 05:04:27 -06:00

tracker.dm

code folder. 221 files changed wew

2018-02-12 21:03:40 -05:00

turbine.dm

Refactors and fixes RPEDs

2018-04-27 13:13:37 -05:00