kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

antimatter

Removes a few spawns

2017-04-25 14:36:18 -05:00

singularity

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

supermatter

SM speaks on engineering channel, now with 100% less freeze (#984)

2017-05-18 11:55:47 -05:00

tesla

Merge pull request #774 from Citadel-Station-13/upstream-merge-26805

2017-05-06 14:24:08 -07:00

apc.dm

A bunch of sparks to do_sparks

2017-05-01 08:36:04 -05:00

cable.dm

A bunch of sparks to do_sparks

2017-05-01 08:36:04 -05:00

cell.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

floodlight.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

generator.dm

yey

2017-05-05 10:00:17 -05:00

gravitygenerator.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

lighting.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

monitor.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

port_gen.dm

A bunch of Initialize()s now have return values

2017-04-25 03:51:57 -05:00

power.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

powernet.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

rtg.dm

A bunch of Initialize()s now have return values

2017-04-25 03:51:57 -05:00

smes.dm

SMES units now accept charge even if the available input is less than the input rate. (#969)

2017-05-14 20:07:20 -07:00

solar.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

switch.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

terminal.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

tracker.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

turbine.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00