Merge remote-tracking branch 'upstream/master' into merge-upstream

ss220club · Dec 2, 2024 · 3e71630 · 3e71630
2 parents c71428e + e6c376b
commit 3e71630
Show file tree

Hide file tree

Showing 403 changed files with 33,568 additions and 81,171 deletions.
diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
@@ -82,6 +82,7 @@ CREATE TABLE `characters` (
   `custom_emotes` LONGTEXT COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL,
   `runechat_color` VARCHAR(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '#FFFFFF',
   `cyborg_brain_type` ENUM('MMI', 'Robobrain', 'Positronic') NOT NULL DEFAULT 'MMI',
+  `pda_ringtone` VARCHAR(16) NULL DEFAULT NULL COLLATE 'utf8mb3_general_ci',
   PRIMARY KEY (`id`),
   KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=125467 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

diff --git a/SQL/updates/62-63.sql b/SQL/updates/62-63.sql
@@ -0,0 +1,5 @@
+# Updates the DB from 62 to 63
+# Adds a PDA ringtone option to character setup
+
+ALTER TABLE `characters`
+	ADD COLUMN `pda_ringtone` VARCHAR(16) NULL DEFAULT NULL AFTER `cyborg_brain_type`;
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -773,7 +773,7 @@
 /turf/simulated/floor/lubed/lavaland_air,
 /area/ruin/powered/clownplanet)
 "bq" = (
-/obj/machinery/disposal/deliveryChute{
+/obj/machinery/disposal/delivery_chute{
 	dir = 1
 	},
 /obj/structure/disposalpipe/trunk,
@@ -890,7 +890,7 @@
 /turf/simulated/floor/carpet/lavaland_air,
 /area/ruin/powered/clownplanet)
 "bN" = (
-/obj/machinery/disposal/deliveryChute,
+/obj/machinery/disposal/delivery_chute,
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
@@ -1103,7 +1103,7 @@
 /turf/simulated/floor/light/lavaland_air,
 /area/ruin/powered/clownplanet)
 "LH" = (
-/obj/machinery/disposal/deliveryChute{
+/obj/machinery/disposal/delivery_chute{
 	desc = "The following is engraved upon the chute: A FATE WORSE THAN DEATH LIES WITHIN";
 	dir = 1;
 	name = "THE TRIAL OF HONKITUDE"

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm
@@ -1127,7 +1127,7 @@
 "Es" = (
 /obj/structure/lattice/catwalk/mining,
 /obj/effect/mapping_helpers/no_lava,
-/obj/structure/ladder/unusable,
+/obj/structure/ladder,
 /turf/simulated/floor/chasm,
 /area/lavaland/surface/outdoors)
 "Et" = (