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

Jump to bottom

micro-upstream #1 #110

Merged
merged 17 commits into from
Dec 2, 2024
Merged

micro-upstream #1 #110

merged 17 commits into from
Dec 2, 2024

Conversation

AwareFoxy
Copy link
Collaborator

@AwareFoxy AwareFoxy commented Dec 2, 2024 •
edited
Loading

Новогодний апстрим

SonicHDC and others added 17 commits November 25, 2024 13:31
@SonicHDC
RCD icons resprite (space-syndicate#2800)
69118ce
@Meguneri
[Maps] Maus Winter Update (space-syndicate#2803)
ca96bb5
@XsenonDash
[MAPS] Paper tweak (space-syndicate#2804)
e0943f8
@IanComradeBot
Automatic changelog update
d675aa9
@CaptainMaru
[MAPS] Avrite winter (space-syndicate#2806)
4171067
@Stubaretka24
[Maps] Awesome new god update (space-syndicate#2811)
4c09d28
@CaptainMaru
[Maps] Avrite minor change (space-syndicate#2810)
7e2fd39
@IanComradeBot
Automatic changelog update
932bade
@SonicHDC
Parallax pack 2 (space-syndicate#2813)
34a23c3
@Vonsant
Revert "Rebalancing zombie mode chances" (space-syndicate#2818)
24c380d
@IanComradeBot
Automatic changelog update
ae4b05e
@Doctorjakes
[Maps] Silly Winter Update (space-syndicate#2809)
ecdba1c
@Ko4ergaPunk
[Maps] Pilgrim update #7 — Winter (space-syndicate#2821)
a793bc4
@Bloodcanis
delta winter (space-syndicate#2824)
feb2e21
@XsenonDash
[MAPS] Paper Cristmass update (space-syndicate#2822)
05d4513
@SonicHDC
resprite new year nuke (space-syndicate#2825)
fba997e
@AwareFoxy
apstrem
031c946
@AwareFoxy AwareFoxy requested a review from Vonsant as a code owner December 2, 2024 10:03
@AwareFoxy AwareFoxy changed the title Upstream micro-upstream #1 Dec 2, 2024
@github-actions github-actions bot added size/XL Changes: Sprites Changes: Map Изменяет карты Changes: No C# ПР без сишарпа S: Needs Review ПРу необходим ревью and removed size/XL labels Dec 2, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 2, 2024

RSI Diff Bot; head commit 031c946 merging into 826bf14
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Devices/nuke.rsi

State Old New Status
nukefestive Modified

@AwareFoxy AwareFoxy merged commit 8023853 into master Dec 2, 2024
15 checks passed
@AwareFoxy
Copy link
Collaborator Author

Во имя отца, сына и святого селфмёрджа. Аминь.

@AwareFoxy AwareFoxy deleted the upstream branch December 2, 2024 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Vonsant Vonsant Awaiting requested review from Vonsant Vonsant is a code owner

Assignees
No one assigned
Labels
Changes: Map Изменяет карты Changes: No C# ПР без сишарпа Changes: Sprites S: Needs Review ПРу необходим ревью S: Untriaged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.