3591 individual conflicts
Update build.js
Update install_node.sh
Update byond.js
oh my fucking god
hat
slow
huh
holy shit
we all fall down
2 more I missed
2900 individual conflicts
2700 Individual conflicts
replaces yarn file with tg version, bumping us down to 2200-ish
Down to 2000 individual conflicts
140 down
mmm
aaaaaaaaaaaaaaaaaaa
not yt
575
soon
900 individual conflicts
600 individual conflicts, 121 file conflicts
im not okay
160 across 19 files
29 in 4 files
0 conflicts, compiletime fix time
some minor incap stuff
missed ticks
weird dupe definition stuff
missed ticks 2
incap fixes
undefs and pie fix
Radio update and some extra minor stuff
returns a single override
no more dupe definitions, 175 compiletime errors
Unticked file fix
sound and emote stuff
honk and more radio stuff
## About The Pull Request
I've stumbled across this enough to finally go through the entire
codebase and fix it. I left out changelogs simply because rewriting
history logs is bad.
## Why It's Good For The Game
I find it pretty annoying because I stumble across words that are
misspelled for a few seconds, and I'm likely not the only one who feels
like this. Less spelling mistakes in code are better.
## Changelog
🆑
spellcheck: Occurrences of "recieve" has been changed to "receive".
/🆑
* Clear out some random errors in github webhook processor (#76232)
subrequests failing randomly was triggering invalid key errors later on
down the line needlessly.
* Clear out some random errors in github webhook processor
---------
Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
* Combined soundadd/sounddel and imageadd/imagedel (#74865)
## About The Pull Request
Combines
```
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
```
into "sound," and
```
imageadd: added some icons and images
imagedel: deleted some icons and images
```
into "image" in the changelog.
I don't think we need to have both; `sound` and `image` can represent
any kind of change to their respective medium.
---------
Co-authored-by: tattle <article.disaster@ gmail.com>
* Combined soundadd/sounddel and imageadd/imagedel
---------
Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: tattle <article.disaster@ gmail.com>
## About The Pull Request
Combines
```
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
```
into "sound," and
```
imageadd: added some icons and images
imagedel: deleted some icons and images
```
into "image" in the changelog.
I don't think we need to have both; `sound` and `image` can represent
any kind of change to their respective medium.
---------
Co-authored-by: tattle <article.disaster@gmail.com>
* April fools PRs can now be marked with [april fools] to automatically tag them as april fools PRs. (#74401)
## About The Pull Request
Really minor change that should make the April fools PR experience
better for PR creators/maints. Not sure if this has any notable
performance implications with the git bot going over its normal stuff,
if it does close this since this is pretty minor.
## Why It's Good For The Game
Its not, anything that encourages april fools PRs makes the game so much
worse.
* April fools PRs can now be marked with [april fools] to automatically tag them as april fools PRs.
---------
Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
## About The Pull Request
Really minor change that should make the April fools PR experience
better for PR creators/maints. Not sure if this has any notable
performance implications with the git bot going over its normal stuff,
if it does close this since this is pretty minor.
## Why It's Good For The Game
Its not, anything that encourages april fools PRs makes the game so much
worse.
* Github hook for adding "Logging" tag to logging PRs (#71633)
## About The Pull Request
Github hook to add the Logging tag to PRs with "log/logs/logging" in the
title.
## Why It's Good For The Game
Computers doing my dirty work for me
## Changelog
No player-facing changes
Co-authored-by: tattle <article.disaster@ gmail.com>
* Github hook for adding "Logging" tag to logging PRs
Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: tattle <article.disaster@ gmail.com>
## About The Pull Request
Github hook to add the Logging tag to PRs with "log/logs/logging" in the
title.
## Why It's Good For The Game
Computers doing my dirty work for me
## Changelog
No player-facing changes
Co-authored-by: tattle <article.disaster@gmail.com>
* Fix github not announcing new prs
* Resets github_webhook_processor.php to upstream version, with our minor modification
* Adds the whole pull_request_hooks folder that we also missed from upstream
Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
I wanted to move auto labeling into its own workflow, but realized that it and changelog generation were coupled. So I'm detaching that first, and then will work on auto labeling later. Includes general code for a changelog parser so that I can reuse it by that point.
GitHub actions are great for downstreams, as setting up a PHP server for the webhook is not trivial, compared to Existing and getting it for free. They are also much more straightforward to test and update than the webhook. I was able to verify this was working trivially with an empty repository.
Tested and working: Mothblocks/ss13-workflow-testing@0a2de4d
* [webhook] treat github api errors when validating users better. (#70219)
Proper fix is to make apisend handle retrying but i can't pr that from in bed when i remember i forgot to look into this so here we are
* [webhook] treat github api errors when validating users better.
Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
* Renamed Balance/Rebalance to Balance, and removes unused rebalance tag (#68485)
* Renamed Balance/Rebalance to Balance, and removes unused rebalance tag
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
* add GBP: No Update label when title includes [no gbp] (#65739)
Co-authored-by: tattle <article.disaster@ gmail.com>
* Add GBP: No Update label when PR title includes [no gbp]
Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: tattle <article.disaster@ gmail.com>
* Limit repository announcements to a whitelist, Discord announces to a blacklist (#63179)
About The Pull Request
Limits the game announcers only to arrays in a fixed whitelist.
Discord announcements, as they're more for those interested in the technical side, are on a blacklist of patterns. This is set to blacklist anything starting with event-*.
This stops a lot of internal repos from clogging chat, but more importantly is going to be used as events will now be hosted on the tgstation organization, and we want to limit spoilers/confusion on that for people who don't go looking for it.
* Limit repository announcements to a whitelist, Discord announces to a blacklist
* Update tools/WebhookProcessor/github_webhook_processor.php
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
About The Pull Request
Limits the game announcers only to arrays in a fixed whitelist.
Discord announcements, as they're more for those interested in the technical side, are on a blacklist of patterns. This is set to blacklist anything starting with event-*.
This stops a lot of internal repos from clogging chat, but more importantly is going to be used as events will now be hosted on the tgstation organization, and we want to limit spoilers/confusion on that for people who don't go looking for it.
* Fixes an issue with changelog generation where the default lines would be included in the logs (#60736)
* In theory this should fix a bug MSO had in coderbus
* Apparently I am a very stupid cat
* Fixes an issue with changelog generation where the default lines would be included in the logs
Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
This pull request converts the changelog to TGUI.
Note: Old unused changelog files will be automatically removed on the next changelog run
Why It's Good For The Game
More consistent UI, ability to view all historic logs.
Changelog
cl Celotajs
refactor: Converted the changelog popup to TGUI
/cl
* Remove the PR balances part of the webhook (#57299)
The action has been working fine, and every bug its had has been solved not with disabling it, but with me resolving it. There's no reason to keep around the old system anymore. Viva la actions.
* Remove the PR balances part of the webhook (in favor of the action)
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
The action has been working fine, and every bug its had has been solved not with disabling it, but with me resolving it. There's no reason to keep around the old system anymore. Viva la actions.
* Removes tweak and replaces it with a tag for QoL and Atomic prs (#56890)
* Removes tweak and replaces it with a tag for QoL and Atomic prs
Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
* Skip first whitespace only lines (#56534)
Parser won't crash on first empty lines anymore.
* Skip first whitespace only lines in changelog PR parser
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
* Use draft pull requests instead of the 'Work In Progress' and 'Needs Review' labels. (#56168)
* Use draft pull requests instead of the 'Work In Progress' and 'Needs Review' labels.
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
