Upstream Sync (License Change) #56
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add (cherry picked from commit ad7256750c5ccb8a5b1025d287dae1d1c507f78e)
(cherry picked from commit 3966a65c659d3881d58c1fb2beadaf6c4e53f827)
* Initial Pass, Rev, Thief * Zombie initial pass * Rebase, Traitor * Nukeops, More overloads * Revert RevolutionaryRuleComponent * Use TryRoundStartAttempt, Rewrite nukie spawning * Comments, Add task scheduler to GameRuleSystem * Zombie initial testing done * Sort methods, rework GameRuleTask * Add CCVar, Initial testing continues * Might as well get rid of the obsolete logging * Oops, i dont know how to log apparently * Suggested formatting fixes * Suggested changes * Fix merge issues * Minor optimisation * Allowed thief to choose other antags * Review changes * Spawn items on floor first, then inserting * minor tweaks * Shift as much as possible to ProtoId<> * Remove unneeded * Add exclusive antag attribute * Fix merge issues * Minor formatting fix * Convert to struct * Cleanup * Review cleanup (need to test a lot) * Some fixes, (mostly) tested * oop * Pass tests (for real) --------- Co-authored-by: Rainfall <[email protected]> Co-authored-by: AJCM <[email protected]> (cherry picked from commit 4e6c59cfe51211064d79a727cc2d37c2a2f55a2c)
(cherry picked from commit a281efde2868151169540aab0ed19c8083753ebe)
(cherry picked from commit 4bb5b23145f37081672072a6be3519a2e1507a76)
* number stuff * too many wehs, must increase price.. * Update fun.yml * Update cargo_fun.yml --------- Co-authored-by: Ed <[email protected]> (cherry picked from commit e17acdc6b04c47b76f5a795525ed499efb389364)
(cherry picked from commit af71f1e2df9abe201d7e30697b6bf5664f90d05e)
Fix PDA home icon. (cherry picked from commit 8c6c19c9934f6a57b861b1a36501c4ca6c68387c)
…leftovers (#25659) * I forgot to commit, damn it * Adds the brick to survival kit (cherry picked from commit e4d98f1ab94d08f7db457b538e857c0732ab0c0d)
…counterpart N2 tanks (#25660) kills off N2 & O2 tanks from lockers & removes duplicate n2 tanks from stuff with o2 tanks (cherry picked from commit b0e811b4f35ba7968c98fe21263bae0b104273d8)
* fills * contrast (cherry picked from commit e2741498b88a3e3b5d6312197525addb918bc53a)
* Change tilefrictionmodifier of default item to base friction * Remove anchored friction modifier from baseItem * Revert "Remove anchored friction modifier from baseItem" This reverts commit 2d9d53f38a3704c8b5df4172629c78812f72f6ae. * Removed anchored friction component from BaseItem. --------- Co-authored-by: Plykiya <[email protected]> (cherry picked from commit e3b061025d86c9712e867f54342e13f6c94b0095)
(cherry picked from commit 7aa0bade6cac1ad8d3b200cec398ebf7cd984e72)
* Using wrench on AME doesn't first try to put it in. * Refactor AME to use ItemSlot for fuel. * Apparently these names want to match. (cherry picked from commit c47391011d0f7f56dfcba8e4db348f0dc0d58c09)
* curwa * fix * huh * revert huh * add fancy white * resprite hospital * add suffix (cherry picked from commit 66cf642e5632dd960a0af56b526020ec1b025c24)
(cherry picked from commit 3caf58029b24080efb029bb31b5f6b14b0d33d0a)
* Undertoned Tail * Locale (cherry picked from commit ba8e92ddc80d66d627384fe44ef47724a082b4cd)
the meat and potatoes YEAH (cherry picked from commit 0001c23df2c917c66c74cde31110285826b9d979)
remove grandpa's fucked up bed (cherry picked from commit 1037bfc6a0016d869359ae825e97c51bdf36ded9)
(cherry picked from commit b2902ff0c55d5daec7678f0cd657c73df6c8ca56)
* cleaning * fix (cherry picked from commit d479c854cc7326c7a2e79ba35172274e22f7f3e0)
…m windows) (#25723) * adds a new syndie space shuttle ruin + plastitanium windows * the green goomba gaming * fixe * visor > gloves (cherry picked from commit 7b9346d2a8f3ab7e62c19b207ba5091cbddd6ecd)
(cherry picked from commit df271f5ead4cfa453093d18675785361300fd10c)
(cherry picked from commit 650c04badb6f4f442a2b352a87a3d27d24fc04f6)
…(#22804) * un-eviled the reinforced glass recipes the tyranny of accidentally crafting plasma glass instead of reinforced plasma glass is finally over * fix? (cherry picked from commit db15efc3a3754d4f180a8787702696df69b1da29)
(cherry picked from commit 36d505b82ae332c1871c0081577794d9c14ae9cf)
Co-authored-by: Jeff <[email protected]> (cherry picked from commit 70307f9e00fbc73278249c719fd77c03e3b8322c)
(cherry picked from commit 2852483b5caf02c9f6688395fc97b170e6d84e82)
added condition checking description to cargo search (cherry picked from commit c83ad11be170f860a0fbd5dde257fd0537e89712)
* add ActionAttemptEvent * add ConfirmableAction compsys * make suicide actions confirmable * use new trolling techniques * better query and dirty them * death --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit ad3f3a5d360be6f7c8acb9c7753b45653a28cc0f)
# Description On a repository (and organization) level, I have enabled Actions to create and approve pull requests. This PR will have the in-game GitHub contributor credits automatically updated every week.
# Description Wouldn't it be great if we had Species info in the Guidebook? Wouldn't it be even better if this was available in the character editor? Now there will be an info button next to the species selection dropdown, complete with hover tooltip. Pressing the button opens the relevant Guidebook page and also loads the other species pages, so the player can click check them all without having to change species in the character editor. --- <details><summary><h1>Media</h2></summary> <p>    </p> </details> # Changelog :cl: Errant - add: Added guidebooks for species - add: Species in the character editor have a shortcut to their guidebook entry Co-authored-by: Errant <[email protected]>
space-wizards/space-station-14#26136 # Description Light Replacer no longer sends out the wrong locale string. Read PR above for details ^ Cherrypicked from Wizden in the gap between last merge and right now.
Courtesy of @justani <3
This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]>
<details><summary><h1>Media</h1></summary> <p>  </p> </details>
# Description Ports space-wizards/space-station-14#26102. Co-authored-by: Tayrtahn <[email protected]>
…ngines into upstream-sync-5
…n-Friendly-Chainsaw into upstream-sync-5
Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
Outdated
Show resolved
Hide resolved
Pspritechologist
requested changes
Mar 31, 2024
There was a problem hiding this comment.
MARKERS.md
- I still really think
// Parkstation-[TitleOfFeature]-Start - Optional clarification of why this change was doneshould be// Parkstation-[TitleOfFeature]-Start // Optional clarification of why this change was done - Ditto for YAML (
#) - File types listed at the bottom mention liscense, which isn't relevant for this file.
- "The following is the annotation formatting per language:"
README.md
- Clarify that translations should go to EinsteinEngines, and not us. No need for us to maintain those anymore.
- "If you make any contributions, please make sure to read the markers section in MARKERS Any changes made to files belonging to our upstream should be properly marked in accordance to what is specified there." is missing punctuation after the word 'MARKERS'
- Add line "Before making a pr here, consider if the feature is specific to us, or would generally improve the codebase. More encompassing features should be made on our Upstream where plenty of the same Maintainers manage. If you're familiar with someone here, feel free to request a review from them in particular."
- Python is not a build dependency, and technically speaking neither is Git.
- I would tell people to learn Git rather than run RUN_THIS.py, but that's me.
- I would say we put the Wizden launcher first. I gotta be honest, MV has been pretty unstable for me and overall has been worse to use.
- Standalone Wizden launcher listed but not MV 🧌
LEGAL.MD
- Double check that EE is also doing the whole half-n-half in terms of licensing.
Pspritechologist
requested changes
Apr 6, 2024
VMSolidus
approved these changes
Apr 14, 2024
DEATHB4DEFEAT
pushed a commit
that referenced
this pull request
Jun 2, 2024
## Mirror of PR #944: [Add Anti Anomaly Zone](DeltaV-Station/Delta-v#944) from <img src="https://avatars.githubusercontent.com/u/131613340?v=4" alt="DeltaV-Station" width="22"/> [DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v) <aside>PR opened by <img src="https://avatars.githubusercontent.com/u/52761126?v=4" width="16"/><a href="https://github.com/rosieposieeee"> rosieposieeee</a> at 2024-03-08 19:07:59 UTC</aside> <aside>PR merged by <img src="https://avatars.githubusercontent.com/u/52761126?v=4" width="16"/><a href="https://github.com/rosieposieeee"> rosieposieeee</a> at 2024-03-17 13:35:52 UTC</aside> <sup> `7abdf9a19fe59243201336e6b586ee4780a4722e` </sup> --- PR changed 0 files with 0 additions and 0 deletions. The PR had the following labels: - Changes: YML - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > > space-wizards/space-station-14#24634 > > Upstream added, then removed this, saying "Remove[d] mapping markers as everything should be ingame entities and this is functioning as an area." They left in the code for downstreams. While an ingame object that can perform this function might be useful, this would be best used for arrivals and inside the atmos gas chambers, to prevent those areas that are supposed to be ungriefed from getting griefed by the game itself. If it were an entity, people would probably game it and move those around, and if it were powered, it would fail at its target function. And regardless, upstream removed this *without adding in that entity to replace it.* > > Additionally, some maps have areas where an anom could fully go crit without anyone noticing and it would never affect anybody... which is really boring, such as this area on arena. I have one or two areas like that on Submarine I'd like to use this for. > >  > </details> Co-authored-by: rosieposie <[email protected]>
DEATHB4DEFEAT
pushed a commit
that referenced
this pull request
Jun 2, 2024
# Description There was a miscommunication, and I bungled the repository during the last round of merges. The Mirror Bot is not quite finished yet, and some polishing needs to happen behind the scenes before we can actually start doing this. Also new policies from the discord are pending regarding how these PRs need to be handled. I'll need to either reopen or remake the reverted PRs, since we do actually still need them. But we need PRs mirrored from Wizards' Den in order to go through the list properly. 
DEATHB4DEFEAT
pushed a commit
that referenced
this pull request
Jun 2, 2024
This reverts commit 648fea3. # Description Now that we have the list of Wizden Mirrors, it's now possible to bring this back, and resume work on maintaining this repo.
Merged
DEATHB4DEFEAT
added
Size: 1-Very Large
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The license change!
All that needs reviewing here is the README, LEGAL, and MARKERS
Update 4: I made my own markers file, look at the description history for the previous updates