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.

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

[MDB IGNORE] [IDB IGNORE] Upstream mirror #422

Merged
merged 108 commits into from
Dec 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
a872e9e
[NO GBP] quick fix to aquarium alt-clicking (#88490)
Ghommie Dec 13, 2024
099a28b
Automatic changelog for PR #88490 [ci skip]
tgstation-ci[bot] Dec 13, 2024
02f94ca
Enable Reagent Dartgun for traitor MDs (#88394)
Runi-c Dec 13, 2024
7f498ed
Automatic changelog for PR #88394 [ci skip]
tgstation-ci[bot] Dec 13, 2024
e9471b0
Adds the NT BR-38 Battle Rifle. A sci-fi hybrid gun, but better than …
necromanceranne Dec 13, 2024
d407546
Automatic changelog for PR #88095 [ci skip]
tgstation-ci[bot] Dec 13, 2024
408fd1f
Prevents the overcharged smes from runtiming when the timer ss falls …
Majkl-J Dec 13, 2024
a7ee450
Fixes temporary block not applying to leap attacks. (#88378)
EnterTheJake Dec 13, 2024
85a8f0f
Automatic changelog for PR #88376 [ci skip]
tgstation-ci[bot] Dec 13, 2024
727aac1
Automatic changelog for PR #88378 [ci skip]
tgstation-ci[bot] Dec 13, 2024
a1745da
adds access restrictions to birdshot engi mulebot window (#88453)
Sadboysuss Dec 13, 2024
e67e294
Automatic changelog for PR #88453 [ci skip]
tgstation-ci[bot] Dec 13, 2024
504fe4a
fixes regal rat attack logic (#88452)
Sadboysuss Dec 13, 2024
f515b77
Automatic changelog for PR #88452 [ci skip]
tgstation-ci[bot] Dec 13, 2024
493a1cc
Aloe now gives you more than one process tick to take it out of the o…
Majkl-J Dec 13, 2024
985ce68
Automatic changelog for PR #88488 [ci skip]
tgstation-ci[bot] Dec 13, 2024
b9a047b
Improves code for leaning (#88494)
SyncIt21 Dec 13, 2024
17b28b3
Adds a doMove() safeguard in case of cyclic contents (#88497)
distributivgesetz Dec 13, 2024
99b29b6
Automatic changelog for PR #88494 [ci skip]
tgstation-ci[bot] Dec 13, 2024
43f83b0
Sprites for mega-stingbangs + fixes primed stingbang sprites (#88472)
SmArtKar Dec 13, 2024
38458e4
Automatic changelog for PR #88497 [ci skip]
tgstation-ci[bot] Dec 13, 2024
c13647d
Automatic changelog for PR #88472 [ci skip]
tgstation-ci[bot] Dec 13, 2024
8343756
Add water sound to sinks (#88443)
timothymtorres Dec 13, 2024
bb9ee70
Automatic changelog for PR #88443 [ci skip]
tgstation-ci[bot] Dec 13, 2024
7d4f121
Fixes various misspellings (#88487)
norsvenska Dec 13, 2024
5ccd52e
Automatic changelog for PR #88487 [ci skip]
tgstation-ci[bot] Dec 13, 2024
e28ca62
Makes all antags visible to an admin in the orbit menu (#88433)
mcbalaam Dec 13, 2024
4a8351b
Automatic changelog for PR #88433 [ci skip]
tgstation-ci[bot] Dec 13, 2024
69bcad8
Automatic changelog compile [ci skip]
tgstation-ci[bot] Dec 14, 2024
cb042fe
Fixes Nebulastation port aft solars (#88499)
lessthnthree Dec 14, 2024
303f508
Automatic changelog for PR #88499 [ci skip]
tgstation-ci[bot] Dec 14, 2024
98b7553
Changes some components to use `parent.deconstruct()` rather than `qd…
MrMelbert Dec 14, 2024
303e06b
Automatic changelog for PR #88468 [ci skip]
tgstation-ci[bot] Dec 14, 2024
f91ac35
makes resin sprayers use the right interact with atom proc (#88432)
Paxilmaniac Dec 14, 2024
f13c877
Automatic changelog for PR #88432 [ci skip]
tgstation-ci[bot] Dec 14, 2024
03f4526
Improve looping sounds to allow nested and non-associative lists (#88…
timothymtorres Dec 14, 2024
2882cb7
Automatic changelog for PR #88462 [ci skip]
tgstation-ci[bot] Dec 14, 2024
b134a3f
[NO GBP] Fixing the displayed stats when examining fishing rods twice…
Ghommie Dec 14, 2024
7a8182d
Automatic changelog for PR #88412 [ci skip]
tgstation-ci[bot] Dec 14, 2024
584de91
Adds a chemical to the chem kit (#88393)
MrMelbert Dec 14, 2024
2c4fd5e
Automatic changelog for PR #88393 [ci skip]
tgstation-ci[bot] Dec 14, 2024
6db5734
Various mob attack procs treat their attacks as unarmed attacks inste…
necromanceranne Dec 14, 2024
4e986e7
Automatic changelog for PR #88481 [ci skip]
tgstation-ci[bot] Dec 14, 2024
8272138
Add run_all_tests and run_alternate_tests to the completion gate need…
Ghommie Dec 14, 2024
337d285
Carbons and Robots indicate they can be dragged onto (with a slight m…
MrMelbert Dec 14, 2024
e725e84
Automatic changelog for PR #88471 [ci skip]
tgstation-ci[bot] Dec 14, 2024
8fd8278
Automatic changelog compile [ci skip]
tgstation-ci[bot] Dec 15, 2024
da85b47
Emphasis handling no longer gets clipped by spans (#88435)
tontyGH Dec 15, 2024
67e03c4
Automatic changelog for PR #88435 [ci skip]
tgstation-ci[bot] Dec 15, 2024
d1b8423
More maintenance for turbine (#88254)
SyncIt21 Dec 15, 2024
27fb2a6
Automatic changelog for PR #88254 [ci skip]
tgstation-ci[bot] Dec 15, 2024
1cdcdf6
that damn CC light (#88509)
JoshAdamPowell Dec 15, 2024
005ce43
Gives nukies beakers (#88508)
JoshAdamPowell Dec 15, 2024
469f7dc
Automatic changelog for PR #88508 [ci skip]
tgstation-ci[bot] Dec 15, 2024
92d224d
Fourth! Time's the Charm: Actually fixes jetpack race conditions this…
SmArtKar Dec 15, 2024
fd97195
Automatic changelog for PR #88492 [ci skip]
tgstation-ci[bot] Dec 15, 2024
47b6019
Fixes gauzes arguments being backwards (also improves wording while h…
MrMelbert Dec 15, 2024
1fff1f4
Automatic changelog for PR #88507 [ci skip]
tgstation-ci[bot] Dec 15, 2024
d4d106c
Rave and plasma stabilizer MODules now utilize theme-specific visors …
SmArtKar Dec 15, 2024
e6e3bde
Automatic changelog for PR #88369 [ci skip]
tgstation-ci[bot] Dec 15, 2024
235a330
Fixes the outdated N-Spect description, adds and cleans examine hints…
OrionTheFox Dec 15, 2024
6082fde
Automatic changelog for PR #88516 [ci skip]
tgstation-ci[bot] Dec 15, 2024
0fa7485
Automatic changelog compile [ci skip]
tgstation-ci[bot] Dec 16, 2024
ce6caf0
Reworks Tasers (doesn't give them back to Security though) Because Fu…
MrMelbert Dec 16, 2024
e5acbf5
Automatic changelog for PR #88347 [ci skip]
tgstation-ci[bot] Dec 16, 2024
bfcdec2
Resprites the Archives and Altar (#88534)
OrionTheFox Dec 16, 2024
6cc75a4
Automatic changelog for PR #88534 [ci skip]
tgstation-ci[bot] Dec 16, 2024
9a83905
General maintenance for RPED (#88074)
SyncIt21 Dec 16, 2024
30e5499
Automatic changelog for PR #88074 [ci skip]
tgstation-ci[bot] Dec 16, 2024
f308a70
Automatic changelog compile [ci skip]
tgstation-ci[bot] Dec 17, 2024
7ddc307
Adds better attack animations and alternate attack modes (#88418)
SmArtKar Dec 17, 2024
185d485
Automatic changelog for PR #88418 [ci skip]
tgstation-ci[bot] Dec 17, 2024
8a8e05a
Fixes emotes done via the emote keybind tgui window being only visibl…
00-Steven Dec 17, 2024
3d44aad
Add dice rolling sound (#88546)
timothymtorres Dec 17, 2024
2bbc69c
Fixes a Honkerblast 5000 runtime (#88532)
SmArtKar Dec 17, 2024
02334af
Fixes c38 not misfiring when chambered in c357 (#88537)
SmArtKar Dec 17, 2024
4385a61
Fixes spelling/grammatical errors/inconsistencies in Funeral Supplies…
mikederkan Dec 17, 2024
e4696a5
Resecure Delta's Xenobio Chamber.dmm (#88530)
Darkened-Earth Dec 17, 2024
3d140ad
Fixes cryo pod's shuttleMove() runtime, remedying constant CI fails (…
tontyGH Dec 17, 2024
4b77c6f
Decouples "Is this affected by a mop" from layer var (#88465)
MrMelbert Dec 17, 2024
28e7e68
Trainers can now verify admins above their weight class (#88360)
MrStonedOne Dec 17, 2024
87fdf8e
Automatic changelog for PR #88548 [ci skip]
tgstation-ci[bot] Dec 18, 2024
cfdbe84
Automatic changelog for PR #88546 [ci skip]
tgstation-ci[bot] Dec 18, 2024
cc0a065
Automatic changelog for PR #88532 [ci skip]
tgstation-ci[bot] Dec 18, 2024
d0619d1
Automatic changelog for PR #88537 [ci skip]
tgstation-ci[bot] Dec 18, 2024
0f9360d
Automatic changelog for PR #88536 [ci skip]
tgstation-ci[bot] Dec 18, 2024
eaa45fd
Automatic changelog for PR #88530 [ci skip]
tgstation-ci[bot] Dec 18, 2024
b1d0efe
Automatic changelog for PR #88526 [ci skip]
tgstation-ci[bot] Dec 18, 2024
5cb1359
Automatic changelog for PR #88465 [ci skip]
tgstation-ci[bot] Dec 18, 2024
8f2a772
Automatic changelog compile [ci skip]
tgstation-ci[bot] Dec 18, 2024
7c9cc84
Fixes mech KA AOE dealing full damage in pressurized environments (#8…
SmArtKar Dec 18, 2024
9f495ac
Automatic changelog for PR #88538 [ci skip]
tgstation-ci[bot] Dec 18, 2024
5b74092
Add fishtank sounds to cryo cell (#88466)
timothymtorres Dec 18, 2024
e79e571
Automatic changelog for PR #88466 [ci skip]
tgstation-ci[bot] Dec 18, 2024
ba38068
Adds removing singular crusher trophies (+relevant screentips) (#88541)
Hatterhat Dec 18, 2024
09e8176
Automatic changelog for PR #88541 [ci skip]
tgstation-ci[bot] Dec 18, 2024
960ed29
Major UI update and theme redesign (#88498)
SmArtKar Dec 18, 2024
55dd390
Automatic changelog for PR #88498 [ci skip]
tgstation-ci[bot] Dec 18, 2024
f1de25f
Automatic changelog compile [ci skip]
tgstation-ci[bot] Dec 19, 2024
252d899
Fixes an airlock unlocking runtime (#88551)
SmArtKar Dec 19, 2024
6a6c952
Automatic changelog for PR #88551 [ci skip]
tgstation-ci[bot] Dec 19, 2024
fb6c089
Fix mesh dropping arguments (#88575)
MrMelbert Dec 19, 2024
6873083
Automatic changelog for PR #88575 [ci skip]
tgstation-ci[bot] Dec 19, 2024
07f5102
Automatic changelog compile [ci skip]
tgstation-ci[bot] Dec 20, 2024
e66c32e
Fix lobby buttons not updating sprites correctly (#88574)
MrMelbert Dec 20, 2024
a9990a4
Automatic changelog for PR #88574 [ci skip]
tgstation-ci[bot] Dec 20, 2024
21d39c3
Merge branch 'master' of https://github.com/tgstation/tgstation
psychonaut-ci[bot] Dec 20, 2024
150eaff
Resolve conflicts
Seefaaa Dec 22, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ jobs:
completion_gate: # Serves as a non-moving target for branch rulesets
if: always() && !cancelled()
name: Completion Gate
needs: [ test_windows, compare_screenshots, compile_all_maps, run_linters ]
needs: [ test_windows, compare_screenshots, compile_all_maps, run_all_tests, run_alternate_tests, run_linters ]
runs-on: ubuntu-latest
steps:
- name: Decide whether the needed jobs succeeded or failed
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/SpaceRuins/meatderelict.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -728,8 +728,8 @@
/obj/effect/turf_decal/siding/purple{
dir = 1
},
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/indestructible/white,
/area/ruin/space/has_grav/powered/biooutpost)
"oQ" = (
Expand Down Expand Up @@ -887,7 +887,7 @@
/obj/effect/turf_decal/siding/purple{
dir = 1
},
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/indestructible/white,
/area/ruin/space/has_grav/powered/biooutpost)
"rl" = (
Expand Down Expand Up @@ -1561,9 +1561,9 @@
/turf/open/indestructible/plating,
/area/ruin/space/has_grav/powered/biooutpost)
"DC" = (
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/obj/item/ammo_casing/c357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/indestructible/white,
/area/ruin/space/has_grav/powered/biooutpost)
"DJ" = (
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/SpaceRuins/mimesvsclowns.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/area/ruin)
"dI" = (
/obj/item/grown/bananapeel,
/obj/item/ammo_casing/a357/spent{
/obj/item/ammo_casing/c357/spent{
dir = 9;
pixel_x = -13;
pixel_y = 10
Expand Down Expand Up @@ -78,19 +78,19 @@
},
/obj/effect/decal/cleanable/blood/gibs,
/obj/machinery/light/small/broken/directional/south,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/floor/iron/checker/airless,
/area/ruin)
"uc" = (
/obj/effect/decal/cleanable/blood/footprints{
dir = 4
},
/obj/item/ammo_casing/a357/spent{
/obj/item/ammo_casing/c357/spent{
pixel_x = -5;
dir = 5;
pixel_y = 6
},
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/obj/item/gps/spaceruin,
/turf/open/floor/plating/airless,
/area/ruin)
Expand Down Expand Up @@ -204,7 +204,7 @@
/obj/effect/mob_spawn/corpse/human/clown,
/obj/effect/decal/cleanable/blood/footprints,
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/floor/plating/airless,
/area/ruin)
"Ij" = (
Expand Down Expand Up @@ -253,7 +253,7 @@
"Pq" = (
/obj/machinery/light/broken/directional/north,
/obj/structure/reagent_dispensers/watertank,
/obj/item/ammo_casing/a357/spent,
/obj/item/ammo_casing/c357/spent,
/turf/open/floor/iron/checker/airless,
/area/ruin)
"Qb" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/SpaceRuins/old_infiltrator.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@
"nF" = (
/obj/item/radio/intercom/directional/south,
/obj/effect/decal/cleanable/blood/old,
/obj/item/ammo_casing/a357/match,
/obj/item/ammo_casing/a357/match{
/obj/item/ammo_casing/c357/match,
/obj/item/ammo_casing/c357/match{
pixel_y = -4;
pixel_x = -7
},
Expand Down Expand Up @@ -306,7 +306,7 @@
/area/ruin/space/unpowered)
"uS" = (
/obj/machinery/newscaster/directional/south,
/obj/item/ammo_casing/a357/match,
/obj/item/ammo_casing/c357/match,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/unpowered)
"vi" = (
Expand Down Expand Up @@ -425,7 +425,7 @@
/turf/open/floor/mineral/plastitanium/red/airless,
/area/ruin/space/unpowered)
"Cv" = (
/obj/item/ammo_casing/a357/match,
/obj/item/ammo_casing/c357/match,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/unpowered)
"CC" = (
Expand Down
24 changes: 12 additions & 12 deletions _maps/RandomRuins/SpaceRuins/russian_derelict.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4146,14 +4146,14 @@
"Eb" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/burnt_floor,
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357{
pixel_x = -6;
pixel_y = 3
},
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357{
pixel_x = -5
},
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357{
pixel_x = 6;
dir = 9;
pixel_y = -3
Expand Down Expand Up @@ -5018,8 +5018,8 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"IG" = (
/obj/item/ammo_casing/a357,
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357,
/obj/item/ammo_casing/c357{
pixel_x = 5;
pixel_y = 6
},
Expand Down Expand Up @@ -6330,11 +6330,11 @@
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/hallway/aft)
"Pv" = (
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357{
pixel_x = 4;
pixel_y = -7
},
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357{
pixel_x = -5
},
/obj/structure/cable,
Expand Down Expand Up @@ -6847,12 +6847,12 @@
"Sk" = (
/obj/structure/cable,
/obj/effect/mapping_helpers/burnt_floor,
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357{
pixel_x = 6;
pixel_y = -4
},
/obj/item/ammo_casing/a357,
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357,
/obj/item/ammo_casing/c357{
pixel_x = -10;
pixel_y = 7;
dir = 9
Expand Down Expand Up @@ -7599,12 +7599,12 @@
/area/ruin/space/ks13/service/hydro)
"VH" = (
/obj/effect/mapping_helpers/burnt_floor,
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357{
pixel_x = 8;
dir = 8;
pixel_y = 6
},
/obj/item/ammo_casing/a357{
/obj/item/ammo_casing/c357{
pixel_x = 6;
pixel_y = -4
},
Expand Down
Loading
Loading