14-10 merge #110

14-10 merge
Fluffy-Frontier · Oct 13, 2023 · c1c3017 · c1c3017
2 parents 3ab93db + e0aff28
commit c1c3017
Show file tree

Hide file tree

Showing 568 changed files with 16,816 additions and 8,351 deletions.
diff --git a/SQL/database_changelog.md b/SQL/database_changelog.md
@@ -2,7 +2,7 @@ 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.25 (5.24 for /tg/); The query to update the schema revision table is:
+The latest database version is 5.27 (5.25 for /tg/); The query to update the schema revision table is:
 
 ```sql
 INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 25);
@@ -15,6 +15,13 @@ 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.27, 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.26, 17 May 2023, by LemonInTheDark
 Modified the library action table to fit ckeys properly, and to properly store ips.

diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql
@@ -660,19 +660,6 @@ CREATE TABLE `game_log` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
---
--- 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`
 --

diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql
@@ -644,19 +644,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`
 --

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -2574,7 +2574,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/canister_frame/machine,
+/obj/structure/fluff/broken_canister_frame,
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/underground/explored)
 "Tr" = (