Merge branch 'master' of github.com:Monkestation/Monkestation2.0 into the-best-idea-ever

Author: Absolucy

.gitignore

@@ -9,6 +9,7 @@ icon_exists_cache.json
 #Ignore everything in datafolder and subdirectories
 /data/**/*
 /tmp/**/*
+/cache/**/*
 
 #Ignore byond config folder.
 /cfg/**/*

RUN_SERVER.cmd

@@ -0,0 +1,2 @@
+@echo off
+call "%~dp0\tools\build\build.bat" --wait-on-error server %*

SQL/tgstation_schema.sql

@@ -721,23 +721,6 @@ CREATE TABLE `tutorial_completions` (
   PRIMARY KEY (`id`),
   UNIQUE INDEX `ckey_tutorial_unique` (`ckey`, `tutorial_key`));
 
---
--- Table structure for table `metric_data`
---
-DROP TABLE IF EXISTS `metric_data`;
-CREATE TABLE `metric_data` (
-	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`datetime` datetime NOT NULL,
-	`cpu` decimal(20,10) unsigned DEFAULT NULL,
-	`maptick` decimal(20,10) unsigned DEFAULT NULL,
-	`elapsed_processed` int(15) unsigned DEFAULT NULL,
-	`elapsed_real` int(15) unsigned DEFAULT NULL,
-	`client_count` int(15) unsigned DEFAULT NULL,
-	`round_id` int(15) unsigned DEFAULT NULL,
-	`relational_id` varchar(255) DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-
 --
 -- Table structure for table `overwatch_asn_ban`
 --
@@ -771,39 +754,6 @@ CREATE TABLE `overwatch_whitelist` (
 	PRIMARY KEY (`ckey`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
 
---
--- Table structure for table `subsystem_extra_metrics`
---
-DROP TABLE IF EXISTS `subsystem_extra_metrics`;
-CREATE TABLE `subsystem_extra_metrics` (
-	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`datetime` datetime NOT NULL,
-	`round_id` int(15) unsigned DEFAULT NULL,
-	`ss_id` varchar(255) DEFAULT NULL,
-	`relation_id_SS` varchar(255) DEFAULT NULL,
-	`ss_value` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
-	PRIMARY KEY (`id`) USING BTREE,
-	CONSTRAINT `ss_value` CHECK (json_valid(`ss_value`))
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-
---
--- Table structure for table `metric_data`
---
-DROP TABLE IF EXISTS `subsystem_metrics`;
-CREATE TABLE `subsystem_metrics` (
-	`id` int(11) NOT NULL AUTO_INCREMENT,
-	`avg_iter_count` decimal(20,6) NOT NULL DEFAULT 0.000000,
-	`avg_drift` decimal(20,6) NOT NULL DEFAULT 0.000000,
-	`datetime` datetime NOT NULL,
-	`round_id` int(15) unsigned DEFAULT NULL,
-	`ss_id` varchar(255) DEFAULT NULL,
-	`relational_id` varchar(255) DEFAULT NULL,
-	`relation_id_SS` varchar(255) DEFAULT NULL,
-	`cost` decimal(20,6) unsigned DEFAULT NULL,
-	`tick_usage` decimal(20,6) unsigned DEFAULT NULL,
-	PRIMARY KEY (`id`) USING BTREE
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

_maps/RandomRuins/SpaceRuins/syndicate_depot.dmm

@@ -1607,7 +1607,6 @@
 /obj/effect/mapping_helpers/apc/cell_10k,
 /obj/structure/safe,
 /obj/item/stack/telecrystal/five,
-/obj/item/stack/telecrystal/twenty,
 /obj/effect/mapping_helpers/apc/cut_AI_wire,
 /obj/item/card/id/advanced/chameleon,
 /obj/item/card/id/advanced/chameleon,