deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476

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

..

designs

Merge pull request #6635 from Citadel-Station-13/upstream-merge-37626

2018-05-04 22:54:00 -05:00

machinery

fixes obj descs and adds new ones (#37483)

2018-04-27 13:21:08 -05:00

techweb

Merge pull request #37651 from 81Denton/donksoft-board

2018-05-05 08:11:04 -05:00

xenobiology

Merge branch 'master' into upstream-merge-37476

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

designs.dm

modules

2018-01-31 06:56:28 -06:00

destructive_analyzer.dm

fixes #5996

2018-03-20 19:18:33 -05:00

experimentor.dm

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

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

rdconsole.dm

sucessfully fixes some grammar (#37095)

2018-04-14 08:12:34 -05:00

rdmachines.dm

Refactors and fixes RPEDs

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

research_disk.dm

Replace CentComm with CentCom in deadchat message (#34249)

2018-01-11 07:39:52 -06:00

server.dm

things with stuff (#6233)

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

stock_parts.dm

Refactors and fixes RPEDs

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