LetterJay
45c283a935
applies the previous fixes for cult on a closed PR
2017-05-16 22:59:41 -05:00
LetterJay
52fa1f314f
Merge branch 'master' into upstream-merge-26760
2017-05-14 01:02:26 -04:00
LetterJay
e66cbfd7db
my v key is broken
2017-05-13 23:32:47 -05:00
LetterJay
36de555483
commit
2017-05-13 23:32:23 -05:00
LetterJay
2abeadb92b
Merge pull request #845 from Citadel-Station-13/upstream-merge-27056
...
[MIRROR] Corrects get id query to ckey
2017-05-12 11:08:18 -04:00
LetterJay
55492bb8ec
even more client fixes! this time with added admin fixes
2017-05-12 09:52:42 -05:00
LetterJay
19db647c58
Merge pull request #793 from Citadel-Station-13/upstream-merge-26922
...
[MIRROR] Adds player age and byond account age to player panel
2017-05-12 03:16:06 -04:00
LetterJay
c7fce18213
travis
2017-05-12 01:54:20 -05:00
CitadelStationBot
a679933cc7
SDQL cleanup ( #904 )
2017-05-11 18:26:15 -07:00
LetterJay
b7acf503eb
rej cleanup
2017-05-10 22:35:01 -05:00
LetterJay
a66e0c949e
Merge pull request #832 from Citadel-Station-13/upstream-merge-23201
...
[MIRROR] [READY]DATUM VERBS AND TOP MENUS!
2017-05-10 23:05:37 -04:00
LetterJay
43318a88a5
rej fix
2017-05-10 21:59:41 -05:00
LetterJay
3c131800b6
Merge pull request #722 from Citadel-Station-13/upstream-merge-26645
...
[MIRROR] Persistent investigate and game logs separated by round ID
2017-05-10 21:12:08 -04:00
LetterJay
57372ebdb0
merge
2017-05-10 19:41:55 -05:00
LetterJay
bc9805dab0
Merge pull request #830 from Citadel-Station-13/upstream-merge-27042
...
[MIRROR] Fixes this annoying ass thing in the bandb I should have fixed before.
2017-05-10 20:08:54 -04:00
kevinz000
49881624e2
Merge pull request #772 from Citadel-Station-13/upstream-merge-26874
...
[MIRROR] Fixes the most annoying thing about admin helping.
2017-05-07 23:16:33 -07:00
CitadelStationBot
47c0304a4b
Corrects get id query to ckey
2017-05-07 19:40:58 -05:00
CitadelStationBot
181eee013e
[READY]DATUM VERBS AND TOP MENUS!
2017-05-07 17:07:59 -05:00
CitadelStationBot
53d43227ab
Fixes this annoying ass thing in the bandb I should have fixed before.
2017-05-07 17:05:44 -05:00
kevinz000
14fe4948e9
Merge pull request #652 from Citadel-Station-13/upstream-merge-26685
...
[MIRROR] Fixed Dsay always causing a disk read
2017-05-06 22:03:08 -07:00
kevinz000
102b28b1c1
Delete deadsay.dm.rej
2017-05-06 21:28:23 -07:00
CitadelStationBot
09655ed5e8
Adds player age and byond account age to player panel
2017-05-05 20:08:07 -05:00
LetterJay
1bb43eb7ae
woo
2017-05-05 10:21:53 -05:00
LetterJay
f2f42091f3
Merge branch 'master' into upstream-merge-26685
2017-05-05 09:42:36 -05:00
LetterJay
5d0f7eafaa
Merge pull request #719 from Citadel-Station-13/upstream-merge-26771
...
[MIRROR] Removes vestigial list from minds.
2017-05-05 09:40:28 -05:00
LetterJay
da4e4bbefe
Merge pull request #707 from Citadel-Station-13/upstream-merge-26746
...
[MIRROR] Makes admin sound announcement use the right span
2017-05-05 09:39:04 -05:00
LetterJay
91f3059be1
Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
...
[MIRROR] Moves tips from config to strings tree
2017-05-05 09:33:45 -05:00
CitadelStationBot
73bef0b6c8
Fixes the most annoying thing about admin helping.
2017-05-04 20:40:09 -05:00
LetterJay
007281a51c
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
2017-05-02 18:53:59 -05:00
CitadelStationBot
49990d0c05
Persistent investigate and game logs separated by round ID
2017-05-02 18:47:58 -05:00
CitadelStationBot
7baccb8b85
Removes vestigial list from minds.
2017-05-02 12:47:20 -05:00
LetterJay
4ecbec1406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
2017-05-02 11:36:27 -05:00
LetterJay
6310292531
woo
2017-05-02 11:19:14 -05:00
LetterJay
fd6df15f93
Merge branch 'master' into upstream-merge-26131
2017-05-02 09:19:49 -05:00
LetterJay
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
LetterJay
a8e6de5795
manual merge
2017-05-02 05:06:13 -05:00
LetterJay
4a6ffec412
rej cleanup
2017-05-02 04:56:46 -05:00
LetterJay
7ab8ee8cae
Merge pull request #581 from Citadel-Station-13/upstream-merge-26524
...
[MIRROR] Admin proc calls are now serialized per admin
2017-05-02 04:51:43 -05:00
CitadelStationBot
036109de58
Changes a bunch of hrefs to the proper defines
2017-05-02 02:20:07 -05:00
CitadelStationBot
b45d4ba668
Makes admin sound announcement use the right span
2017-05-01 17:32:29 -05:00
CitadelStationBot
529125d3dd
Moves tips from config to strings tree
2017-05-01 11:51:27 -05:00
CitadelStationBot
34a701a1bc
You can no longer queue up ahelps by queing up prompts
2017-05-01 11:38:04 -05:00
LetterJay
a3eec6c8f9
Merge pull request #670 from Citadel-Station-13/upstream-merge-26713
...
[MIRROR] [s] SDQL security patches
2017-05-01 08:11:36 -05:00
LetterJay
31ea9cb309
Merge pull request #657 from Citadel-Station-13/upstream-merge-26689
...
[MIRROR] [s] Patches SDQL exploits that can return world reference
2017-05-01 08:11:22 -05:00
LetterJay
dd904e3640
Merge pull request #663 from Citadel-Station-13/upstream-merge-26736
...
[MIRROR] >You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-05-01 08:02:44 -05:00
LetterJay
d46b85e9ed
Merge pull request #653 from Citadel-Station-13/upstream-merge-26676
...
[MIRROR] Fix SDQL vars again
2017-05-01 07:59:42 -05:00
CitadelStationBot
7a4f1496e9
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-01 07:24:45 -05:00
CitadelStationBot
fbe0803699
[s] SDQL security patches
2017-04-30 11:30:44 -05:00
CitadelStationBot
3799c28620
>You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-04-30 10:24:27 -05:00
CitadelStationBot
9ef9161537
[s] Patches SDQL exploits that can return world reference
2017-04-29 16:59:08 -05:00
