Merge remote-tracking branch 'upstream/master'

ErdGinalD · Sep 30, 2024 · 3d4f10a · 3d4f10a
2 parents 67d721a + 0d79dc6
commit 3d4f10a
Show file tree

Hide file tree

Showing 103 changed files with 1,299 additions and 504 deletions.
diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
@@ -250,7 +250,7 @@ CREATE TABLE `feedback` (
   `datetime` datetime NOT NULL,
   `round_id` int(8) NOT NULL,
   `key_name` varchar(32) NOT NULL,
-  `key_type` enum('text', 'amount', 'tally', 'nested tally', 'associative') NOT NULL,
+  `key_type` ENUM('text', 'amount', 'tally', 'nested tally', 'associative', 'ledger', 'nested ledger') NOT NULL,
   `version` tinyint(3) UNSIGNED NOT NULL,
   `json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
   PRIMARY KEY (`id`)

diff --git a/SQL/updates/59-60.sql b/SQL/updates/59-60.sql
@@ -0,0 +1,23 @@
+-- Migration:  59-60
+-- Author:     warriorstar
+-- Introduced: PR# 26645
+
+-- This migration adds the 'ledger' and 'nested ledger' enum values to the
+-- `feedback` table in conjunction with making those feedback types available
+-- through SSblackbox.
+-- No data migration is required.
+
+ALTER TABLE
+	`feedback`
+MODIFY
+	COLUMN `key_type` ENUM(
+		'text',
+		'amount',
+		'tally',
+		'nested tally',
+		'associative',
+		'ledger',
+		'nested ledger'
+	) NOT NULL
+AFTER
+	`key_name`;
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -9,14 +9,9 @@
 /turf/simulated/wall/mineral/iron,
 /area/ruin/powered)
 "d" = (
-/obj/item/clothing/head/helmet/space/syndicate/orange,
 /obj/item/clothing/mask/breath,
 /turf/simulated/floor/plating,
 /area/ruin/powered)
-"e" = (
-/obj/item/clothing/suit/space/syndicate/orange,
-/turf/simulated/floor/plating,
-/area/ruin/powered)
 "g" = (
 /turf/simulated/floor/plating/asteroid{
 	name = "dirt"
@@ -363,7 +358,7 @@ s
 "}
 (11,1,1) = {"
 c
-e
+o
 h
 g
 l

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm
@@ -1173,12 +1173,6 @@
 	},
 /turf/simulated/floor/plating/asteroid/airless,
 /area/syndicate_depot/outer)
-"dg" = (
-/obj/item/gps/ruin{
-	gpstag = "ERR#UNKWN"
-	},
-/turf/simulated/wall/mineral/plastitanium/nodiagonal,
-/area/syndicate_depot/core)
 "Te" = (
 /turf/simulated/mineral/random/high_chance,
 /area/syndicate_depot/outer)
@@ -1913,7 +1907,7 @@ aj
 aj
 ao
 ad
-dg
+at
 aL
 aD
 aZ