Commit Graph

19 Commits

Author SHA1 Message Date
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot
19a1d3555c Fixes death report giving the wrong damage type 2017-06-09 20:06:36 -05:00
LetterJay
dbb233b874 missed a few things 2017-06-06 07:49:18 -05:00
LetterJay
905bd168aa commit 2017-06-06 07:13:04 -05:00
LetterJay
2eb7872a6a Merge pull request #1285 from Citadel-Station-13/upstream-merge-27782
[MIRROR] Adds coalesce to world.internet_address
2017-06-05 02:12:56 -05:00
CitadelStationBot
9dd40f1fad Adds coalesce to world.internet_address 2017-05-29 09:15:12 -05:00
CitadelStationBot
83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
LetterJay
fabe1e98a7 update blackbox.dm 2017-05-26 12:02:26 -05:00
CitadelStationBot
795ae0111d Fixes Blackbox subsystem def 2017-05-23 13:45:23 -05:00
Poojawa
2be5022536 Merge branch 'master' into upstream-merge-27268 2017-05-21 01:22:16 -05:00
CitadelStationBot
c8e9e34d2b [MIRROR] Fixes stat gathering (#1025)
* Fixes stat gathering

* Delete blackbox.dm.rej

* Update blackbox.dm
2017-05-21 01:07:14 -05:00
Poojawa
186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05:00
CitadelStationBot
e0af0df435 [MIRROR] Adds Mass Insert proc to sql (#986)
* Adds Mass Insert proc to sql

* Update blackbox.dm

* Update dbcore.dm

* Delete dbcore.dm.rej
2017-05-20 23:43:16 -05:00
CitadelStationBot
94b7e560ab World.dm Refactor 2017-05-18 16:37:46 -05:00
LetterJay
57372ebdb0 merge 2017-05-10 19:41:55 -05:00
CitadelStationBot
49990d0c05 Persistent investigate and game logs separated by round ID 2017-05-02 18:47:58 -05:00
LetterJay
991fb8335c manual merge 2017-04-29 11:42:28 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00