Upstream Merge June 14th (The Final PR) (#103)

* June 14th upstream merge

Author: Jolly-66

.github/CODEOWNERS

@@ -25,8 +25,7 @@
 /code/modules/admin/verbs/adminhelp.dm @Cyberboss
 /code/modules/admin/verbs/adminpm.dm @Cyberboss
 /code/modules/mapping/ @Cyberboss
-/tools/LinuxOneShot/ @Cyberboss
-/tools/tgs4_scripts/ @Cyberboss
+
 
 # Mothblocks
 
@@ -54,6 +53,7 @@
 /code/controllers/subsystem/timer.dm @MrStonedOne
 /code/controllers/configuration/entries @MrStonedOne
 /config/ @MrStonedOne
+/tools/build/ @MrStonedOne
 
 # ninjanomnom
 
@@ -81,7 +81,7 @@
 
 # Multiple Owners
 
-/icons/ @Twaticus @ShizCalev
+/icons/ @Twaticus @ShizCalev @Krysonism
 /code/controllers/subsystem/air.dm @LemonInTheDark @MrStonedOne
 /_maps/ @sqnztb
 /_maps/ @EOBGames @ShizCalev @Maurukas

.github/CONTRIBUTING.md

@@ -463,7 +463,7 @@ All procs that are registered to listen for signals using `RegisterSignal()` mus
 ```
 This is to ensure that it is clear the proc handles signals and turns on a lint to ensure it does not sleep.
 
-Any sleeping behaviour that you need to perform inside a `SIGNAL_HANDLER` proc must be called asynchronously (e.g. with `INVOKE_ASYNC()`) or be redone to work asynchronously.
+Any sleeping behaviour that you need to perform inside a `SIGNAL_HANDLER` proc must be called asynchronously (e.g. with `INVOKE_ASYNC()`) or be redone to work asynchronously. 
 
 ### Enforcing parent calling
 When adding new signals to root level procs, eg;
@@ -576,7 +576,7 @@ Good:
 		off_overlay = iconstate2appearance(icon, "off")
 		broken_overlay = icon2appearance(broken_icon)
 	if (stat & broken)
-		add_overlay(broken_overlay)
+		add_overlay(broken_overlay) 
 		return
 	if (is_on)
 		add_overlay(on_overlay)
@@ -599,7 +599,7 @@ Bad:
 	if(isnull(our_overlays)
 		our_overlays = list("on" = iconstate2appearance(overlay_icon, "on"), "off" = iconstate2appearance(overlay_icon, "off"), "broken" = iconstate2appearance(overlay_icon, "broken"))
 	if (stat & broken)
-		add_overlay(our_overlays["broken"])
+		add_overlay(our_overlays["broken"]) 
 		return
 	...
 ```

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,8 +11,9 @@
 
 ## Changelog
 :cl:
-add: Added new things
+add: Added new mechanics or gameplay changes
 add: Added more things
+expansion: Expands content of an existing thing
 del: Removed old things
 qol: made something easier to use
 balance: rebalanced something

.github/gbp.toml

@@ -5,7 +5,7 @@ reset_label = "GBP: Reset"
 "Atomic" = 2
 "Balance/Rebalance" = -8
 "Code Improvement" = 2
-"Feature" = -10
+"Mechanic" = -10
 "Feedback" = 2
 "Fix" = 3
 "Grammar and Formatting" = 1
@@ -14,6 +14,7 @@ reset_label = "GBP: Reset"
 "Priority: CRITICAL" = 20
 "Priority: High" = 15
 "Quality of Life" = 1
+"Content Expansion" = -3
 "Refactor" = 10
 "Sound" = 3
 "Sprites" = 3

.github/workflows/ci_suite.yml

@@ -58,9 +58,7 @@ jobs:
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
           python3 tools/ci/template_dm_generator.py
-          tools/build/build
-        env:
-          CBT_BUILD_MODE : ALL_MAPS
+          tools/build/build dm -DCIBUILDING -DCITESTING -DALL_MAPS
 
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
@@ -98,7 +96,7 @@ jobs:
         run: |
           bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          tools/build/build
+          tools/build/build -DCIBUILDING
           bash tools/ci/run_server.sh
         env:
           CBT_BUILD_MODE: TEST_RUN

SQL/database_changelog.txt

@@ -2,12 +2,74 @@ Any time you make a change to the schema files, remember to increment the databa
 
 The latest database version is 5.14; The query to update the schema revision table is:
 
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 14);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 15);
 or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 14);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 15);
 
 In any query remember to add a prefix to the table names if you use one.
 
+-----------------------------------------------------
+Version 5.15, 2 June 2021, by Mothblocks
+Added verified admin connection log used for 2FA
+
+```
+DROP TABLE IF EXISTS `admin_connections`;
+CREATE TABLE `admin_connections` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `ckey` VARCHAR(32) NOT NULL,
+  `ip` INT(11) UNSIGNED NOT NULL,
+  `cid` VARCHAR(32) NOT NULL,
+  `verification_time` DATETIME NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `unique_constraints` (`ckey`, `ip`, `cid`));
+```
+
+-----------------------------------------------------
+
+Version 5.14, xx May 2021, by Anturke
+Added exploration drone adventure table
+
+```
+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;
+```
+
+-----------------------------------------------------
+
+Version 5.13, 30 April 2021, by Atlanta Ned
+Added the `citation` table for tracking security citations in the database.
+
+```
+CREATE TABLE `citation` (
+	`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`round_id` INT(11) UNSIGNED NOT NULL,
+	`server_ip` INT(11) UNSIGNED NOT NULL,
+	`server_port` INT(11) UNSIGNED NOT NULL,
+	`citation` TEXT NOT NULL COLLATE 'utf8mb4_general_ci',
+	`action` VARCHAR(20) NOT NULL DEFAULT '' COLLATE 'utf8mb4_general_ci',
+	`sender` VARCHAR(32) NOT NULL DEFAULT '' COLLATE 'utf8mb4_general_ci',
+	`sender_ic` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'Longer because this is the character name, not the ckey' COLLATE 'utf8mb4_general_ci',
+	`recipient` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'Longer because this is the character name, not the ckey' COLLATE 'utf8mb4_general_ci',
+	`crime` TEXT NOT NULL COLLATE 'utf8mb4_general_ci',
+	`fine` INT(4) NULL DEFAULT NULL,
+	`paid` INT(4) NULL DEFAULT '0',
+	`timestamp` DATETIME NOT NULL,
+	PRIMARY KEY (`id`) USING BTREE,
+	UNIQUE INDEX `idx_constraints` (`round_id`, `server_ip`, `server_port`, `citation`(100)) USING BTREE
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=InnoDB
+AUTO_INCREMENT=1
+;
+```
+
 -----------------------------------------------------
 
 Version 5.14, xx May 2021, by Anturke

SQL/tgstation_schema.sql

@@ -630,6 +630,20 @@ CREATE TABLE `text_adventures` (
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB;
 
+--
+-- Table structure for table `admin_connections`
+--
+DROP TABLE IF EXISTS `admin_connections`;
+CREATE TABLE `admin_connections` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `ckey` VARCHAR(32) NOT NULL,
+  `ip` INT(11) UNSIGNED NOT NULL,
+  `cid` VARCHAR(32) NOT NULL,
+  `verification_time` DATETIME NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `unique_constraints` (`ckey`, `ip`, `cid`)
+) ENGINE=InnoDB;
+
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

SQL/tgstation_schema_prefixed.sql

@@ -630,6 +630,20 @@ CREATE TABLE `SS13_text_adventures` (
 	PRIMARY KEY (`id`)
 ) ENGINE=InnoDB;
 
+--
+-- Table structure for table `admin_connections`
+--
+DROP TABLE IF EXISTS `SS13_admin_connections`;
+CREATE TABLE `SS13_admin_connections` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `ckey` VARCHAR(32) NOT NULL,
+  `ip` INT(11) UNSIGNED NOT NULL,
+  `cid` VARCHAR(32) NOT NULL,
+  `verification_time` DATETIME NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `unique_constraints` (`ckey`, `ip`, `cid`)
+) ENGINE=InnoDB;
+
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;