Skip to content

Commit

Permalink
Merge branch 'master' into attack-ai-and-robot-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
mystery3525 committed Sep 23, 2024
2 parents 315ff77 + c5230ca commit 29e4f45
Show file tree
Hide file tree
Showing 506 changed files with 10,955 additions and 7,250 deletions.
8 changes: 8 additions & 0 deletions SQL/beestation_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,14 @@ CREATE TABLE IF NOT EXISTS `SS13_characters` (
`feature_human_tail` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_human_ears` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_psyphoza_cap` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_diona_leaves` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_diona_thorns` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_diona_flowers` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_diona_moss` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_diona_mushroom` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_diona_antennae` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_diona_eyes` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`feature_diona_pbody` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`helmet_style` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`preferred_ai_core_display` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
`preferred_security_department` VARCHAR(32) COLLATE 'utf8mb4_general_ci',
Expand Down
18 changes: 15 additions & 3 deletions SQL/database_changelog.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
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.

The latest database version is 7.2; The query to update the schema revision table is:
The latest database version is 7.3; The query to update the schema revision table is:

INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 2);
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 3);
or
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 2);
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 3);

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


-----------------------------------------------------
Version 7.3, 30 April 2024, by XeonMations
Dionae - Species Addition

ALTER TABLE `SS13_characters`
ADD COLUMN IF NOT EXISTS `feature_diona_leaves` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_psyphoza_cap`,
ADD COLUMN IF NOT EXISTS `feature_diona_thorns` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_leaves`,
ADD COLUMN IF NOT EXISTS `feature_diona_flowers` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_thorns`,
ADD COLUMN IF NOT EXISTS `feature_diona_moss` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_flowers`,
ADD COLUMN IF NOT EXISTS `feature_diona_mushroom` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_moss`,
ADD COLUMN IF NOT EXISTS `feature_diona_antennae` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_mushroom`,
ADD COLUMN IF NOT EXISTS `feature_diona_eyes` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_antennae`,
ADD COLUMN IF NOT EXISTS `feature_diona_pbody` VARCHAR(64) COLLATE 'utf8mb4_general_ci' AFTER `feature_diona_eyes`;

-----------------------------------------------------

Expand Down
10 changes: 10 additions & 0 deletions _maps/Prefab/Departments.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/RandomRooms/10x10/sk_rdm148_botany_apiary.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/RandomRooms/5x3/sk_rdm071_pubbykitchen.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 29 additions & 11 deletions _maps/RandomRuins/SpaceRuins/gasthelizards.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion _maps/RandomRuins/SpaceRuins/oldteleporter.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 50 additions & 5 deletions _maps/RandomRuins/SpaceRuins/power_puzzle.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions _maps/RandomRuins/SpaceRuins/spacehotel.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 29e4f45

Please sign in to comment.