Merge branch 'master' of https://github.com/tgstation/tgstation

EuSouAFazer · Oct 14, 2023 · f9f8784 · f9f8784
2 parents fb3666e + 9a247a3
commit f9f8784
Show file tree

Hide file tree

Showing 587 changed files with 14,096 additions and 5,596 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -142,6 +142,7 @@
 /code/datums/armor/ @ZephyrTFA
 /code/modules/admin/verbs/ @ZephyrTFA
 /code/modules/logging/ @ZephyrTFA
+/tools/ci/check_grep.sh @ZephyrTFA
 
 
 # CONTRIBUTORS

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

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" = (