Merge branch 'master' into giant_armored_seprentids

ss220club · Nov 6, 2024 · d36f0c0 · d36f0c0
2 parents ee1324a + c7f3e32
commit d36f0c0
Show file tree

Hide file tree

Showing 75 changed files with 2,882 additions and 1,508 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -14,7 +14,6 @@
 
 # CI + Tooling
 /.github/workflows/ @AffectedArc07
-/code/modules/unit_tests/ @AffectedArc07
 /tools/ci/ @AffectedArc07
 _build_dependencies.sh @AffectedArc07
 
@@ -24,10 +23,14 @@ _build_dependencies.sh @AffectedArc07
 
 # Executables that need to be security-cleared
 dreamchecker.exe @AffectedArc07
-milla.dll @AffectedArc07
+rustlibs.dll @AffectedArc07
 rust_g.dll @AffectedArc07
 
 ### S34NW
 
 # TGUI stuff
 /tgui/bin @S34NW
+
+
+### Overrides for the above
+/tools/ci/check_grep2.py @ParadiseSS13/commit-access
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -656,7 +656,7 @@
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/powered/clownplanet)
 "bf" = (
-/turf/simulated/mineral/clown/volcanic,
+/turf/simulated/mineral/volcanic/clown,
 /area/ruin/powered/clownplanet)
 "bg" = (
 /obj/item/pickaxe,
@@ -1006,7 +1006,7 @@
 /obj/structure/disposalpipe/segment/corner{
 	dir = 8
 	},
-/turf/simulated/mineral/clown/volcanic,
+/turf/simulated/mineral/volcanic/clown,
 /area/ruin/powered/clownplanet)
 "pv" = (
 /obj/machinery/light{