Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Upstream 05.11.2024 #1640

Merged
merged 30 commits into from
Nov 5, 2024
Merged

Merge Upstream 05.11.2024 #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
63d3ebf
[s] Fixes a thing (#27254)
Adrer Nov 1, 2024
03cef88
[s] autotraitor code moment number 82 (#27259)
Qwertytoforty Nov 2, 2024
580fb4b
[TWEAK] Cryopod now give you a HUD alert that you can click to ghost …
Adrer Nov 2, 2024
e80594d
fix: update random plant menu icon (#27252)
warriorstar-orion Nov 3, 2024
8347352
Adds trait flying to the trait list (#27253)
Qwertytoforty Nov 3, 2024
c88ebe9
c-4 no longer blows up your backpack, boxes, or modsuits (#27223)
Qwertytoforty Nov 3, 2024
9f8fe58
assaullt pod map fix (#27142)
Henri215 Nov 3, 2024
5d754d4
tweak: slightly reduce spawn rate of boulders on blocked burrows (#27…
warriorstar-orion Nov 3, 2024
5c0ec1b
camera sprites (#27116)
Henri215 Nov 3, 2024
8fea31a
hostile soviets (#27114)
Henri215 Nov 3, 2024
7b19092
refactor: Datumizes ore. (#27043)
warriorstar-orion Nov 3, 2024
ba2c422
Unhands some codeowners stuff (#27215)
AffectedArc07 Nov 3, 2024
08b74db
BRPD Auto-wrenching (#26855)
Toastical Nov 3, 2024
483782c
fix: typo making unintentional type (#27279)
warriorstar-orion Nov 3, 2024
3715f9b
fix: mining charges work again for non-ore rock (#27275)
warriorstar-orion Nov 3, 2024
e5ff107
Fix crew monitor map being cut off on y axis after resizing window (#…
pwbokie Nov 3, 2024
66ed8f5
fix (#27291)
Bm0n Nov 4, 2024
08b9259
[FIX] Ventcrawling overlay fixes (#27013)
Adrer Nov 4, 2024
4a43b6a
buffs SM events (#27034)
silverplatedelta Nov 4, 2024
e64499a
mapping: add lava attractor helper (#27155)
warriorstar-orion Nov 4, 2024
358f062
pulse demon summoner warns better (#27137)
Qwertytoforty Nov 4, 2024
12cb55d
[s] Fixes flayers borking radios sometimes (#27293)
DGamerL Nov 4, 2024
d827a06
Merge branch 'master' into merge-upstream
AyIong Nov 5, 2024
7125284
TGUI Rebuildo
AyIong Nov 5, 2024
8f2252b
Fix lavaland
AyIong Nov 5, 2024
78ac77b
Fixes flavor text not being viewable (#27245)
Contrabang Nov 5, 2024
9e6d8da
Fixes Admin Comms Consoles (#27274)
Contrabang Nov 5, 2024
a148404
Merge branch 'master' into merge-upstream
AyIong Nov 5, 2024
5ac9a04
So many useless icons (#27153)
DGamerL Nov 5, 2024
9de5759
Merge branch 'master' into merge-upstream
AyIong Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/CODEOWNERS
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
View file
Open in desktop
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
Loading