Skip to content

Commit

Permalink
Merge branch 'translate' into surgery_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Chorden523 authored Jul 13, 2024
2 parents 388227c + 503e363 commit 1e2ece6
Show file tree
Hide file tree
Showing 1,545 changed files with 50,172 additions and 31,053 deletions.
3 changes: 3 additions & 0 deletions .github/guides/VISUALS.md
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,9 @@ There are a few snowflake layers that can be used to accomplish niche goals, alo

Floating layers will float "up" the chain of things they're being drawn onto, until they find a real layer. They'll then offset off of that.

Adding `TOPDOWN_LAYER` (actual value `10000`) to another layer forces the appearance into topdown rendering, locally disabling [side map](#side_map-check-the-main-page-too).
We can think of this as applying to planes, since we don't want it interlaying with other non topdown objects.

This allows us to keep relative layer differences while not needing to make all sources static. Often very useful.

## Planes
Expand Down
40 changes: 40 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
'TGUI':
- changed-files:
- any-glob-to-any-file: 'tgui/**'

'Звук':
- changed-files:
- any-glob-to-any-file: '**/*.ogg'

'Спрайты':
- changed-files:
- any-glob-to-any-file: ['**/*.dmi', '**/*.png']

'Изменение Карты':
- changed-files:
- any-glob-to-any-file: '**/*.dmm'

'НЕ МОДУЛЬНО':
- all:
- changed-files:
- any-glob-to-any-file: 'code/**'
- base-branch: 'master'

'Перевод':
- base-branch: 'translate'

'Инструменты':
- changed-files:
- any-glob-to-any-file: ['.gihub/workflows/**', 'tools/**']

'Изменение конфига':
- changed-files:
- any-glob-to-any-file: 'config/**'

'Документация':
- changed-files:
- any-glob-to-any-file: '**/*.md'

'SQL':
- changed-files:
- any-glob-to-any-file: 'SQL/**'
13 changes: 13 additions & 0 deletions .github/workflows/label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: "Label"

on:
- pull_request_target

jobs:
labeler:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
sync-labels: true
5 changes: 4 additions & 1 deletion .github/workflows/render_nanomaps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,7 @@ jobs:
git pull origin master
git commit -m "NanoMap Auto-Update (`date`)" -a || true
git push -f -u origin nanomap-render
gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master"
result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master")
if echo "$result" | grep -q "No commits between master and nanomap-render"
echo "No NanoMaps update required, skipping."
exit 78
1 change: 0 additions & 1 deletion _maps/RandomRuins/AnywhereRuins/golem_ship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,6 @@
"Ro" = (
/obj/structure/table/wood,
/obj/item/bedsheet/rd/royal_cape{
layer = 3;
pixel_x = 5;
pixel_y = 9
},
Expand Down
6 changes: 1 addition & 5 deletions _maps/RandomRuins/IceRuins/icemoon_surface_bughabitat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
/turf/open/floor/iron,
/area/ruin/bughabitat)
"sr" = (
/obj/machinery/plumbing/growing_vat,
/obj/machinery/vatgrower,
/turf/open/floor/iron,
/area/ruin/bughabitat)
"st" = (
Expand Down Expand Up @@ -322,14 +322,10 @@
/area/ruin/bughabitat)
"Ku" = (
/obj/structure/table,
/obj/item/construction/plumbing/research,
/turf/open/floor/plastic,
/area/ruin/bughabitat)
"Ly" = (
/obj/structure/table,
/obj/item/stack/ducts/fifty{
amount = 23
},
/mob/living/basic/butterfly,
/turf/open/floor/plastic,
/area/ruin/bughabitat)
Expand Down
5 changes: 2 additions & 3 deletions _maps/RandomRuins/IceRuins/icemoon_surface_phonebooth.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 4
},
/obj/machinery/atmospherics/components/tank/air{
dir = 8;
piping_layer = 4
/obj/machinery/atmospherics/components/tank/air/layer4{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/floor/plating/icemoon,
Expand Down
Loading

0 comments on commit 1e2ece6

Please sign in to comment.