Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 390bb28

Browse files
committed
Merge remote-tracking branch 'origin/master' into med-skin
2 parents 9936f8c + b2a2961 commit 390bb28

149 files changed

Lines changed: 3568 additions & 1984 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
/code/modules/client/preferences.dm @yogstation13/head-coders
2424
/code/modules/client/preferences_savefile.dm @yogstation13/head-coders
25+
/html/templates/ @yogstation13/head-coders
2526

2627
#monster860
2728

.github/workflows/turdis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ jobs:
127127
echo "MANPATH=/home/runner/BYOND/byond/man:$MANPATH" >> $GITHUB_ENV
128128
cd $GITHUB_WORKSPACE
129129
tools/travis/install_rust_g.sh
130+
#tools/travis/install_extools.sh
130131
mysql -u root -h 127.0.0.1 -e 'CREATE DATABASE tg_travis;'
131132
mysql -u root -h 127.0.0.1 tg_travis < SQL/tgstation_schema.sql
132133
mysql -u root -h 127.0.0.1 -e 'CREATE DATABASE tg_travis_prefixed;'

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM tgstation/byond:514.1554 as base
1+
FROM tgstation/byond:514.1565 as base
22

33
FROM base as build_base
44

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ code tab of https://github.com/yogstation13/Yogstation
3535
(note: this will use a lot of bandwidth if you wish to update and is a lot of
3636
hassle if you want to make any changes at all, so it's not recommended.)
3737

38-
## The Yogstation codebase recommends compiling using version [514.1554](http://www.byond.com/download/build/514/514.1554_byond.exe) and may potentially NOT work on newer or older versions.
39-
38+
## The Yogstation codebase recommends compiling using version [514.1565](https://www.byond.com/download/build/514/514.1565_byond.exe) and may potentially NOT work on newer or older versions.
4039

4140
## :exclamation: How to compile :exclamation:
4241

SQL/database_changelog.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
22

3-
The latest database version is 5.5; The query to update the schema revision table is:
3+
The latest database version is 5.6; The query to update the schema revision table is:
44

5-
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 5);
5+
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 6);
66
or
7-
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 5);
7+
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 6);
88

99
In any query remember to add a prefix to the table names if you use one.
1010

11+
version 5.6 14 August 2021, by alexkar598
12+
13+
Adds index on connection_log
14+
15+
create index idx_review
16+
on connection_log (ckey, computerid, ip);
17+
18+
1119
----------------------------------------------------
1220

1321
version 5.5 14 August 2021, by JamieD1

SQL/tgstation_schema.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ CREATE TABLE IF NOT EXISTS `connection_log` (
117117
`ckey` varchar(45) DEFAULT NULL,
118118
`ip` int(10) unsigned NOT NULL,
119119
`computerid` varchar(45) DEFAULT NULL,
120-
PRIMARY KEY (`id`)
120+
PRIMARY KEY (`id`),
121+
KEY `idx_review` (`ckey`, `computerid`, `ip`)
121122
) ENGINE=InnoDB AUTO_INCREMENT=4192042 DEFAULT CHARSET=utf8;
122123

123124

SQL/tgstation_schema_prefixed.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ CREATE TABLE IF NOT EXISTS `SS13_connection_log` (
117117
`ckey` varchar(45) DEFAULT NULL,
118118
`ip` int(10) unsigned NOT NULL,
119119
`computerid` varchar(45) DEFAULT NULL,
120-
PRIMARY KEY (`id`)
120+
PRIMARY KEY (`id`),
121+
KEY `idx_review` (`ckey`, `computerid`, `ip`)
121122
) ENGINE=InnoDB AUTO_INCREMENT=4192042 DEFAULT CHARSET=utf8;
122123

123124

0 commit comments

Comments
 (0)