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

Adrer · Nov 25, 2024 · b631a9d · b631a9d
2 parents 21d06e1 + 09830b2
commit b631a9d
Show file tree

Hide file tree

Showing 147 changed files with 5,468 additions and 4,678 deletions.
diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
@@ -280,6 +280,7 @@ CREATE TABLE `player` (
   `default_slot` smallint(4) DEFAULT '1',
   `toggles` int(11) DEFAULT NULL,
   `toggles_2` int(11) DEFAULT NULL,
+  `toggles_3` int(11) DEFAULT NULL,
   `sound` mediumint(8) DEFAULT '31',
   `light` MEDIUMINT(3) NOT NULL DEFAULT '7',
   `glowlevel` TINYINT(1) NOT NULL DEFAULT '1',

diff --git a/SQL/updates/61-62.sql b/SQL/updates/61-62.sql
@@ -0,0 +1,4 @@
+# Updating the SQL from version 61 to version 12. -AffectedArc07
+# Adds a new bitflag column for toggles
+
+ALTER TABLE `player` ADD COLUMN `toggles_3` INT NULL DEFAULT NULL AFTER `toggles_2`;
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
@@ -169,7 +169,7 @@
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "aL" = (
-/obj/mecha/working/ripley/mining,
+/obj/mecha/working/ripley/mining/old,
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "aM" = (