Skip to content

Commit

Permalink
Merge pull request #218 from carpotoxin/TG-parity-nov-1
Browse files Browse the repository at this point in the history
Tg parity nov 1
  • Loading branch information
Paxilmaniac authored Nov 11, 2024
2 parents 00ca6bf + 845949b commit 56248e9
Show file tree
Hide file tree
Showing 178 changed files with 303,156 additions and 2,653 deletions.
19 changes: 15 additions & 4 deletions SQL/database_changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,30 @@ Any time you make a change to the schema files, remember to increment the databa

Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`.

The latest database version is 5.27; The query to update the schema revision table is:
The latest database version is 5.28; The query to update the schema revision table is:

```sql
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 27);
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 28);
```
or

```sql
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 27);
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 28);
```

In any query remember to add a prefix to the table names if you use one.
-----------------------------------------------------
Version 5.28, 1 November 2024, by Ghommie
Added `fish_progress` as the first 'progress' subtype of 'datum/award/scores'

```sql
CREATE TABLE `fish_progress` (
`ckey` VARCHAR(32) NOT NULL,
`progress_entry` VARCHAR(32) NOT NULL,
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`ckey`,`progress_entry`)
) ENGINE=InnoDB;
```
-----------------------------------------------------
Version 5.27, 26 April 2024, by zephyrtfa
Add the ip intel whitelist table
```sql
Expand Down
10 changes: 10 additions & 0 deletions SQL/tgstation_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,16 @@ CREATE TABLE `achievement_metadata` (
PRIMARY KEY (`achievement_key`)
) ENGINE=InnoDB;

-- Table structure for table 'x_progress'

DROP TABLE IF EXISTS `fish_progress`;
CREATE TABLE `fish_progress` (
`ckey` VARCHAR(32) NOT NULL,
`progress_entry` VARCHAR(32) NOT NULL,
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`ckey`,`progress_entry`)
) ENGINE=InnoDB;

--
-- Table structure for table `ticket`
--
Expand Down
10 changes: 10 additions & 0 deletions SQL/tgstation_schema_prefixed.sql
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,16 @@ CREATE TABLE `SS13_achievement_metadata` (
PRIMARY KEY (`achievement_key`)
) ENGINE=InnoDB;

-- Table structure for table 'SS13_x_progress'

DROP TABLE IF EXISTS `SS13_fish_progress`;
CREATE TABLE `fish_progress` (
`ckey` VARCHAR(32) NOT NULL,
`progress_entry` VARCHAR(32) NOT NULL,
`datetime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`ckey`,`progress_entry`)
) ENGINE=InnoDB;

--
-- Table structure for table `SS13_ticket`
--
Expand Down
1 change: 1 addition & 0 deletions _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\NorthStar\north_star.dmm"
#include "map_files\tramstation\tramstation.dmm"
#include "map_files\NebulaStation\NebulaStation.dmm"
#include "map_files\wawastation\wawastation.dmm"

#ifdef CIBUILDING
Expand Down
Loading

0 comments on commit 56248e9

Please sign in to comment.