Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/tgstation/tgstation
Browse files Browse the repository at this point in the history
  • Loading branch information
@carshalash
carshalash committed Nov 15, 2023
2 parents 93c7abd + f4ae281 commit c5e5a3e
Show file tree
Hide file tree
Showing 2,424 changed files with 174,460 additions and 59,699 deletions.
23 changes: 17 additions & 6 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,13 @@

# ninjanomnom

/code/__DEFINES/dcs/ @ninjanomnom
/code/controllers/subsystem/dcs.dm @ninjanomnom
/code/controllers/subsystem/shuttle.dm @ninjanomnom
/code/datums/components/ @ninjanomnom
/code/datums/elements/ @ninjanomnom
/code/modules/shuttle/ @ninjanomnom
/code/datums/signals.dm @ninjanomnom
/code/datums/components/_component.dm @ninjanomnom
/code/datums/elements/_element.dm @ninjanomnom
/code/datums/greyscale/_greyscale_config.dm @ninjanomnom
/code/datums/greyscale/json_reader.dm @ninjanomnom
/code/datums/greyscale/layer.dm @ninjanomnom

# Ryll-Ryll/Shaps

Expand Down Expand Up @@ -125,7 +126,6 @@
# tralezab
/code/__DEFINES/basic_mobs.dm @tralezab
/code/datums/ai @tralezab
/code/modules/mob/living/basic/ @tralezab

# Watermelon914

Expand All @@ -141,6 +141,7 @@
/code/datums/armor/ @ZephyrTFA
/code/modules/admin/verbs/ @ZephyrTFA
/code/modules/logging/ @ZephyrTFA
/tools/ci/check_grep.sh @ZephyrTFA


# CONTRIBUTORS
Expand Down Expand Up @@ -185,19 +186,29 @@
/SQL/ @Jordie0608 @MrStonedOne

/_maps/ @EOBGames @Maurukas @MMMiracles @san7890 @ShizCalev

/icons/ @Imaginos16 @Krysonism @Twaticus @Wallemations
/icons/ass/ @Ghilker @tralezab

/code/__DEFINES/atmospherics/ @Ghilker @LemonInTheDark

/code/__HELPERS/logging/ @dragomagol @ZephyrTFA

/code/controllers/subsystem/air.dm @LemonInTheDark @MrStonedOne

/code/modules/atmospherics/ @Ghilker @LemonInTheDark

/code/modules/client/preferences.dm @Mothblocks @ZephyrTFA
/code/modules/client/preferences_savefile.dm @Mothblocks @ZephyrTFA

/code/modules/jobs/job_types/chief_medical_officer.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
/code/modules/jobs/job_types/medical_doctor.dm @ExcessiveUseOfCobblestone @Ryll-Ryll
/code/modules/jobs/job_types/paramedic.dm @ExcessiveUseOfCobblestone @Ryll-Ryll

/code/modules/mob/living/basic/ @Jacquerel @san7890 @tralezab

/code/modules/surgery/ @ExcessiveUseOfCobblestone @Ryll-Ryll

/tools/build/ @MrStonedOne @stylemistake
/tools/tgs_scripts/ @Cyberboss @MrStonedOne

Expand Down
16 changes: 9 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@

[![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)

* **Website:** https://www.tgstation13.org
* **Code:** https://github.com/tgstation/tgstation
* **Wiki:** https://tgstation13.org/wiki/Main_Page
* **Codedocs:** https://codedocs.tgstation13.org/
* **/tg/station Discord:** https://tgstation13.org/phpBB/viewforum.php?f=60
* **Coderbus Discord:** https://discord.gg/Vh8TJp9
| Website | Link |
|---------------------------|------------------------------------------------|
| Website | [https://www.tgstation13.org](https://www.tgstation13.org) |
| Code | [https://github.com/tgstation/tgstation](https://github.com/tgstation/tgstation) |
| Wiki | [https://tgstation13.org/wiki/Main_Page](https://tgstation13.org/wiki/Main_Page) |
| Codedocs | [https://codedocs.tgstation13.org/](https://codedocs.tgstation13.org/) |
| /tg/station Discord | [https://tgstation13.org/phpBB/viewforum.php?f=60](https://tgstation13.org/phpBB/viewforum.php?f=60) |
| Coderbus Discord | [https://discord.gg/Vh8TJp9](https://discord.gg/Vh8TJp9) |

This is the codebase for the /tg/station flavoured fork of SpaceStation 13.

Expand All @@ -21,7 +23,7 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th
## DOWNLOADING
[Downloading](.github/guides/DOWNLOADING.md)

[Running on the server](.github/guides/RUNNING_A_SERVER.md)
[Running a server](.github/guides/RUNNING_A_SERVER.md)

[Maps and Away Missions](.github/guides/MAPS_AND_AWAY_MISSIONS.md)

Expand Down
13 changes: 10 additions & 3 deletions SQL/database_changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,26 @@ 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.24; The query to update the schema revision table is:
The latest database version is 5.25; The query to update the schema revision table is:

```sql
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 24);
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 25);
```
or

```sql
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 24);
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 25);
```

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

-----------------------------------------------------
Version 5.25, 27 September 2023, by Jimmyl
Removes the text_adventures table because it is no longer used
```sql
DROP TABLE IF EXISTS `text_adventures`;
```

-----------------------------------------------------
Version 5.24, 17 May 2023, by LemonInTheDark
Modified the library action table to fit ckeys properly, and to properly store ips.
Expand Down
13 changes: 0 additions & 13 deletions SQL/tgstation_schema.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,19 +637,6 @@ CREATE TABLE `discord_links` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB;

--
-- Table structure for table `text_adventures`
--
DROP TABLE IF EXISTS `text_adventures`;
CREATE TABLE `text_adventures` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`adventure_data` LONGTEXT NOT NULL,
`uploader` VARCHAR(32) NOT NULL,
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`approved` TINYINT(1) NOT NULL DEFAULT FALSE,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;

--
-- Table structure for table `admin_connections`
--
Expand Down
13 changes: 0 additions & 13 deletions SQL/tgstation_schema_prefixed.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,19 +637,6 @@ CREATE TABLE `SS13_discord_links` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB;

--
-- Table structure for table `text_adventures`
--
DROP TABLE IF EXISTS `SS13_text_adventures`;
CREATE TABLE `SS13_text_adventures` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`adventure_data` LONGTEXT NOT NULL,
`uploader` VARCHAR(32) NOT NULL,
`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`approved` TINYINT(1) NOT NULL DEFAULT FALSE,
PRIMARY KEY (`id`)
) ENGINE=InnoDB;

--
-- Table structure for table `admin_connections`
--
Expand Down
Loading

0 comments on commit c5e5a3e

Please sign in to comment.