Skip to content

Commit

Permalink
Merge branch 'master' into brig_medic
Browse files Browse the repository at this point in the history
  • Loading branch information
Glamyrio authored Nov 6, 2024
2 parents 8d06e7b + c7f3e32 commit f479358
Show file tree
Hide file tree
Showing 62 changed files with 848 additions and 708 deletions.
7 changes: 5 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

# CI + Tooling
/.github/workflows/ @AffectedArc07
/code/modules/unit_tests/ @AffectedArc07
/tools/ci/ @AffectedArc07
_build_dependencies.sh @AffectedArc07

Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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{
Expand Down
Loading

0 comments on commit f479358

Please sign in to comment.