Merge branch 'master' into spacepods

ss220club · Mar 11, 2024 · e83c7f8 · e83c7f8
2 parents 39794e3 + 7648c5f
commit e83c7f8
Show file tree

Hide file tree

Showing 368 changed files with 5,233 additions and 4,687 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -470,15 +470,15 @@ Look for code examples on how to properly use it.
 
 #### Bitflags
 
-* We prefer using bitshift operators instead of directly typing out the value. I.E:
+* Bitshift operators are mandatory, opposed to directly typing out the value. I.E:
 
 ```dm
     #define MACRO_ONE (1<<0)
     #define MACRO_TWO (1<<1)
     #define MACRO_THREE (1<<2)
 ```
 
-Is preferable to:
+Is accepted, whereas the following is not:
 
 ```dm
     #define MACRO_ONE 1

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,14 +1,35 @@
 {
 	"version": "2.0.0",
 	"tasks": [
+		{
+			"type": "shell",
+			"command": "paracode/linters/check_grep2",
+			"windows": {
+				"command": ".\\tools\\bootstrap\\python.bat .\\tools\\ci\\check_grep2.py ${relativeFile}",
+			},
+			"problemMatcher": {
+				"owner": "dm",
+				"fileLocation": "relative",
+				"pattern": {
+					"regexp": "^(.*):(\\d+):\\s+(.*)$",
+					"file": 1,
+					"line": 2,
+					"message": 3,
+				}
+			},
+			"label": "linters: run check_grep2"
+		},
 		{
 			"type": "dreammaker",
 			"dme": "paradise.dme",
 			"problemMatcher": [
 				"$dreammaker"
 			],
 			"group": "build",
-			"label": "dm: build - paradise.dme"
+			"label": "dm: build - paradise.dme",
+			"dependsOn": [
+				"linters: run check_grep2",
+			]
 		},
 		{
 			"type": "shell",
@@ -36,6 +57,5 @@
 			"group": "build",
 			"label": "tgui: run dev server"
 		}
-		,
 	]
 }
diff --git a/_build_dependencies.sh b/_build_dependencies.sh
@@ -6,11 +6,11 @@ export NODE_VERSION=20
 # Stable Byond Major
 export STABLE_BYOND_MAJOR=515
 # Stable Byond Minor
-export STABLE_BYOND_MINOR=1630
-# Beta Byond Major
-export BETA_BYOND_MAJOR=515
-# Beta Byond Minor
-export BETA_BYOND_MINOR=1630
+export STABLE_BYOND_MINOR=1633
+# Beta Byond Major - Uncomment and update if beta cycle active
+#export BETA_BYOND_MAJOR=515
+# Beta Byond Minor - Uncomment and update if beta cycle active
+#export BETA_BYOND_MINOR=1633
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.11.6
 # RUSTG version

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -955,7 +955,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
 "by" = (

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm
@@ -3,7 +3,7 @@
 /turf/template_noop,
 /area/template_noop)
 "ab" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/plating/asteroid/snow/atmosphere,
 /area/ruin/powered/snow_biodome)
 "ac" = (
@@ -287,9 +287,9 @@
 	},
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/pod/dark{
-	oxygen = 14;
-	nitrogen = 23;
-	temperature = 300
+	oxygen = 8;
+	nitrogen = 14;
+	temperature = 500
 	},
 /area/ruin/powered/snow_biodome)
 "jE" = (

diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm
@@ -1129,7 +1129,6 @@
 /area/lavaland/surface/outdoors)
 "Es" = (
 /obj/structure/lattice/catwalk/mining,
-/obj/effect/baseturf_helper/lava_land/surface,
 /obj/effect/mapping_helpers/no_lava,
 /obj/structure/ladder/unusable,
 /turf/simulated/floor/chasm,
@@ -1366,7 +1365,7 @@
 /area/ruin/unpowered/althland_excavation)
 "Rf" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/pod/light{
 	oxygen = 0;
 	nitrogen = 0