Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps

SQL/database_changelog.txt

@@ -2,12 +2,24 @@ Any time you make a change to the schema files, remember to increment the databa
 
 The latest database version is 2.0; The query to update the schema revision table is:
 
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (2, 1);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (2, 2);
 or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (2, 1);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (2, 2);
 
 In any query remember to add a prefix to the table names if you use one.
 
+----------------------------------------------------
+Version 2.2, 04 April 2024, by TiviPlus
+Added `tutorial_completions` to mark what ckeys have completed contextual tutorials.
+
+```
+CREATE TABLE `tutorial_completions` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `ckey` VARCHAR(32) NOT NULL,
+  `tutorial_key` VARCHAR(64) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `ckey_tutorial_unique` (`ckey`, `tutorial_key`));
+```
 ----------------------------------------------------
 
 Version 2.1, 2 February 2021, by TiviPlus - adds playtime tracking to notes

SQL/tgmc-schema.sql

@@ -370,6 +370,14 @@ END
 $$
 DELIMITER ;
 
+DROP TABLE IF EXISTS `tutorial_completions`;
+CREATE TABLE `tutorial_completions` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `ckey` VARCHAR(32) NOT NULL,
+  `tutorial_key` VARCHAR(64) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `ckey_tutorial_unique` (`ckey`, `tutorial_key`));
+
 /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
 /*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

_maps/_basemap.dm

@@ -24,6 +24,7 @@
 		#include "map_files\Lawanka_Outpost\LawankaOutpost.dmm"
 		#include "map_files\slumbridge\slumbridge.dmm"
 		#include "map_files\DaedalusPrison\DaedalusPrison.dmm"
+		#include "map_files\riptide\riptide.dmm"
 		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif

_maps/bigred_v2.json

@@ -6,6 +6,7 @@
 		"basic": 1
 	},
 	"quickbuilds": 2300,
+	"armor": "desert",
 	"announce_text": "A second generation colony has had a beacon transmitting the same signal, nonstop. Attempts to hail the colony over comms have proved futile. Because the ship was at a nearby drydock, it has been dispatched to figure out what's wrong. TGMC, prepare to deploy!",
 	"traits":[{
 		"weather_sandstorm": true

_maps/desparity.json

@@ -8,6 +8,6 @@
     "armor": "jungle",
 	"announce_text": "An emergency broadcast has been picked up by our scanners, triangulated to a jungle outpost near LV624, known as Desparity. Through use of bluespace drive tech, the ship has jumped within range of the colony. TGMC, gear up and get ready to respond!",
 	"traits":[{
-		"weather_acidrain": false
+		"weather_rain": true
 	}]
 }

_maps/gelida_iv.json

@@ -12,7 +12,7 @@
 		"set4": 2
 	},
     "armor": "ice",
-	"quickbuilds": 1600,
+	"quickbuilds": 1900,
 	"announce_text": "Our comms array has detected an automated emergency signal broadcasting over a frequency reserved for the highest level of emergencies. The message was traced to the northern reaches of the research colony Gelida IV. The ship is moving into the sector with thrusters at max throttle. TGMC, get briefed and then move out!",
 	"traits":[{
 		"weather_snowstorm": true

_maps/interiors/apc_cloner.dmm

@@ -0,0 +1,194 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/interior/apc/nineteen,
+/area/interior/apc)
+"b" = (
+/obj/structure/bed/chair/driver_gunner_seat{
+	pixel_x = -3;
+	pixel_y = -5
+	},
+/turf/open/interior/apc/eleven,
+/area/interior/apc)
+"c" = (
+/obj/machinery/computer/cloning_console/vats{
+	dir = 2;
+	layer = 2.99;
+	pixel_x = 8
+	},
+/turf/open/interior/apc/nine,
+/area/interior/apc)
+"d" = (
+/turf/closed/interior/apc/twenty,
+/area/interior/apc)
+"e" = (
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"g" = (
+/turf/closed/interior/apc/five,
+/area/interior/apc)
+"h" = (
+/turf/closed/interior/apc/twelve,
+/area/interior/apc)
+"l" = (
+/turf/closed/interior/apc/twentyseven,
+/area/interior/apc)
+"m" = (
+/obj/structure/gun_breech/secondary,
+/obj/machinery/gibber/apc,
+/turf/open/interior/apc/twentytwo,
+/area/interior/apc)
+"n" = (
+/turf/open/interior/apc/ten,
+/area/interior/apc)
+"o" = (
+/turf/open/interior/apc/sixteen,
+/area/interior/apc)
+"p" = (
+/turf/closed/interior/apc/thirteen,
+/area/interior/apc)
+"s" = (
+/turf/open/interior/apc/eight,
+/area/interior/apc)
+"t" = (
+/obj/machinery/cloning/vats/apc/south{
+	pixel_y = -16
+	},
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"B" = (
+/obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
+/turf/closed/interior/apc/six,
+/area/interior/apc)
+"C" = (
+/turf/closed/interior/tank/door,
+/area/interior/apc)
+"D" = (
+/turf/open/interior/apc/fifteen,
+/area/interior/apc)
+"F" = (
+/obj/machinery/quick_vendor/beginner{
+	pixel_x = 28
+	},
+/turf/closed/interior/apc/thirteen,
+/area/interior/apc)
+"H" = (
+/obj/machinery/cloning/vats/apc/south{
+	pixel_y = -16
+	},
+/turf/closed/interior/apc/four,
+/area/interior/apc)
+"I" = (
+/turf/closed/interior/apc/twentythree,
+/area/interior/apc)
+"J" = (
+/turf/open/interior/apc/fourteen,
+/area/interior/apc)
+"L" = (
+/turf/closed/interior/apc/twentyeight,
+/area/interior/apc)
+"P" = (
+/turf/closed/interior/apc/twentyfour,
+/area/interior/apc)
+"R" = (
+/obj/machinery/cloning/vats/apc{
+	dir = 1;
+	pixel_y = 16
+	},
+/turf/closed/interior/apc/twentyseven,
+/area/interior/apc)
+"S" = (
+/turf/closed/interior/apc/seventeen,
+/area/interior/apc)
+"T" = (
+/obj/machinery/computer/cloning_console/vats{
+	dir = 1;
+	pixel_x = 8
+	},
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+"U" = (
+/obj/machinery/cloning/vats/apc/south{
+	pixel_y = -16
+	},
+/turf/closed/interior/apc/three,
+/area/interior/apc)
+"W" = (
+/obj/structure/ammo_rack/secondary{
+	pixel_y = -13
+	},
+/turf/closed/interior/apc/two,
+/area/interior/apc)
+"Y" = (
+/turf/closed/interior/apc/one,
+/area/interior/apc)
+"Z" = (
+/obj/structure/bed/chair/loader_seat{
+	pixel_y = -5
+	},
+/obj/structure/periscope/apc,
+/turf/open/interior/apc/twentynine,
+/area/interior/apc)
+
+(1,1,1) = {"
+Y
+C
+F
+p
+a
+"}
+(2,1,1) = {"
+e
+s
+J
+T
+R
+"}
+(3,1,1) = {"
+t
+c
+D
+T
+R
+"}
+(4,1,1) = {"
+t
+c
+D
+T
+R
+"}
+(5,1,1) = {"
+U
+c
+D
+T
+R
+"}
+(6,1,1) = {"
+H
+c
+D
+Z
+l
+"}
+(7,1,1) = {"
+W
+n
+o
+m
+l
+"}
+(8,1,1) = {"
+g
+b
+S
+I
+d
+"}
+(9,1,1) = {"
+B
+h
+P
+P
+L
+"}