Skip to content

Commit 0ff1938

Browse files
Marabout2Marabout2
committed
2 parents 82dbee2 + 697323f commit 0ff1938

File tree

4,671 files changed

+406864
-394071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,671 files changed

+406864
-394071
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ body:
2424
multiple: true
2525
description: Where did the bug happen?
2626
options:
27-
- Dun Manor
28-
- DakkaTown
27+
- Vanderlin
2928
validations:
3029
required: true
3130

3231
- type: textarea
33-
id: what-happened
32+
id: issue-summary
3433
attributes:
3534
label: Describe the issue
3635
description: Please detail, as objectively and specifically as possible, what happened that you considered to be a bug.
@@ -48,8 +47,28 @@ body:
4847
validations:
4948
required: false
5049

50+
- type: textarea
51+
id: test-merges
52+
attributes:
53+
label: Test Merges
54+
description: List the testmerges active when you were reporting the bug.
55+
placeholder: |
56+
List the testmerges here.
57+
validations:
58+
required: false
59+
60+
- type: input
61+
id: reporting-version
62+
attributes:
63+
label: "Client Version:"
64+
description: |
65+
The BYOND version you are using to report this issue. You can find this information in the bottom left corner of the "About BYOND" window in the BYOND client. It is strongly recommended that you include this, especially for concerns on the visual aspects of the game.
66+
placeholder: "xxx.xxxx"
67+
validations:
68+
required: false
69+
5170
- type: input
52-
id: rounddetails
71+
id: round-id
5372
attributes:
5473
label: Round ID
5574
description: If you have the round ID where the bug occurred, please supply it here.

‎.github/workflows/labeller.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Label PR
2+
on:
3+
pull_request_target:
4+
types: [closed, opened, synchronize]
5+
jobs:
6+
# labeler must run before gbp because gbp calculates itself based on labels
7+
labeler:
8+
runs-on: ubuntu-latest
9+
if: github.event.action == 'opened' || github.event.action == 'synchronize'
10+
permissions:
11+
pull-requests: write # to apply labels
12+
issues: write # to apply labels
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
- name: Run Auto Labeler
17+
uses: actions/github-script@v7
18+
with:
19+
script: |
20+
const { get_updated_label_set } = await import('${{ github.workspace }}/tools/pull_request_hooks/autoLabel.js');
21+
const new_labels = await get_updated_label_set({ github, context });
22+
github.rest.issues.setLabels({
23+
issue_number: context.issue.number,
24+
owner: context.repo.owner,
25+
repo: context.repo.repo,
26+
labels: new_labels,
27+
});
28+
console.log(`Labels updated: ${new_labels}`);

‎.vscode/launch.json‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
8+
9+
10+
{
11+
"type": "byond",
12+
"request": "launch",
13+
"name": "Launch DreamSeeker",
14+
"preLaunchTask": "dm: build - ${command:CurrentDME}",
15+
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
16+
},
17+
18+
{
19+
"type": "byond",
20+
"request": "launch",
21+
"name": "Launch DreamSeeker (low memory mode)",
22+
"preLaunchTask": "Build All (low memory mode)",
23+
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
24+
},
25+
{
26+
"type": "byond",
27+
"request": "launch",
28+
"name": "Launch DreamSeeker (low memory mode) no dungeons",
29+
"preLaunchTask": "Build All (low memory mode) no dungeons",
30+
"dmb": "${workspaceFolder}/${command:CurrentDMB}"
31+
},
32+
{
33+
"type": "byond",
34+
"request": "launch",
35+
"name": "Launch DreamDaemon",
36+
"preLaunchTask": "dm: build - ${command:CurrentDME}",
37+
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
38+
"dreamDaemon": true
39+
},
40+
{
41+
"type": "byond",
42+
"request": "launch",
43+
"name": "Launch DreamDaemon (unit tests)",
44+
"preLaunchTask": "Build All (unit tests)",
45+
"dmb": "${workspaceFolder}/${command:CurrentDMB}",
46+
"dreamDaemon": true
47+
},
48+
]
49+
}

‎.vscode/tasks.json‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "dreammaker",
6+
"dme": "stonekeep.dme",
7+
"problemMatcher": ["$dreammaker"],
8+
"group": "build",
9+
"label": "dm: build - stonekeep.dme"
10+
},
11+
12+
{
13+
"type": "process",
14+
"command": "tools/build/build",
15+
"args": ["-DLOWMEMORYMODE"],
16+
"windows": {
17+
"command": ".\\tools\\build\\build.bat",
18+
"args": ["-DLOWMEMORYMODE"]
19+
},
20+
"options": {
21+
"env": {
22+
"DM_EXE": "${config:dreammaker.byondPath}"
23+
}
24+
},
25+
"problemMatcher": [
26+
"$dreammaker",
27+
"$tsc",
28+
"$eslint-stylish"
29+
],
30+
"group": {
31+
"kind": "build"
32+
},
33+
"dependsOn": "dm: reparse",
34+
"label": "Build All (low memory mode)"
35+
},
36+
37+
{
38+
"type": "process",
39+
"command": "tools/build/build",
40+
"args": ["-DLOWMEMORYMODE", "-DNO_DUNGEON"],
41+
"windows": {
42+
"command": ".\\tools\\build\\build.bat",
43+
"args": ["-DLOWMEMORYMODE", "-DNO_DUNGEON"]
44+
},
45+
"options": {
46+
"env": {
47+
"DM_EXE": "${config:dreammaker.byondPath}"
48+
}
49+
},
50+
"problemMatcher": [
51+
"$dreammaker",
52+
"$tsc",
53+
"$eslint-stylish"
54+
],
55+
"group": {
56+
"kind": "build"
57+
},
58+
"dependsOn": "dm: reparse",
59+
"label": "Build All (low memory mode) no dungeons"
60+
},
61+
{
62+
"type": "process",
63+
"command": "tools/build/build",
64+
"args": ["-DUNIT_TESTS"],
65+
"windows": {
66+
"command": ".\\tools\\build\\build.bat",
67+
"args": ["-DUNIT_TESTS"]
68+
},
69+
"options": {
70+
"env": {
71+
"DM_EXE": "${config:dreammaker.byondPath}"
72+
}
73+
},
74+
"problemMatcher": [
75+
"$dreammaker",
76+
"$tsc",
77+
"$eslint-stylish"
78+
],
79+
"group": {
80+
"kind": "build"
81+
},
82+
"dependsOn": "dm: reparse",
83+
"label": "Build All (unit tests)"
84+
},
85+
]
86+
}

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# OpenKeep
1+
# VANDERLIN
22

3-
[![BYOND Build](https://github.com/Darkrp-community/OpenKeep/actions/workflows/ci_suite.yml/badge.svg)](https://github.com/Darkrp-community/OpenKeep/actions/workflows/ci_suite.yml)
3+
[![BYOND Build](https://github.com/Vanderlin-Tales-Of-Wine/Vanderlin/actions/workflows/ci_suite.yml/badge.svg)](https://github.com/Vanderlin-Tales-Of-Wine/Vanderlin/actions/workflows/ci_suite.yml)
44

55
| Website | Link |
66
|---------------------------|------------------------------------------------|

‎SQL/tgstation_schema.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,23 @@ CREATE TABLE `achievement_metadata` (
534534
PRIMARY KEY (`achievement_key`)
535535
) ENGINE=InnoDB;
536536

537+
--
538+
-- Table structure for table `discord_links`
539+
--
540+
DROP TABLE IF EXISTS `discord_links`;
541+
CREATE TABLE `discord_links` (
542+
`id` int(11) NOT NULL AUTO_INCREMENT,
543+
`ckey` varchar(32) NOT NULL,
544+
`discord_id` bigint(20) DEFAULT NULL,
545+
`timestamp` timestamp NOT NULL DEFAULT current_timestamp(),
546+
`one_time_token` varchar(100) NOT NULL,
547+
`valid` tinyint(1) NOT NULL DEFAULT 0,
548+
`cached_state` tinyint(3) unsigned DEFAULT NULL,
549+
`cached_timestamp` timestamp NULL DEFAULT NULL,
550+
`cached_username` tinytext DEFAULT NULL,
551+
PRIMARY KEY (`id`)
552+
) ENGINE=InnoDB;
553+
537554
--
538555
-- Table structure for table `ticket`
539556
--

0 commit comments

Comments
 (0)