Initial Rebase Work#341
Closed
DaCookieCakes wants to merge 2236 commits into
Closed
Conversation
Co-authored-by: Josh Greenslade <joshua.greenslade@onyxinsight.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
* Do a prepass on entities and fixtures * Add an early exit on proxy intersections * Redo styling and formatting * Formatting redo * Readd moved comment * Respace comment * Whitespace
fix Co-authored-by: MetalSage <metalsage.official@gmail.com>
…eck (#44053) * MoverController.IsAroundCollider: parents, collide * minor optimization --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* Quick protoman removal Saves bringing every commit over until a better pr is done. * Update submodule to 278.0.0
I doubt the average player has even heard of exp.
* TabletopSystem-move-to-shared * final refactor * Update TabletopHologramComponent.cs * Update AdminVerbSystem.Smites.cs * merge * line * prediction fix * Fix the scrunkly * Also noticed this --------- Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
* scrub * Revert "scrub" This reverts commit bbbaaacfb84fab4814e8d5c1e9309f72593d9e6e. * Revert "Revert "scrub"" This reverts commit 8d29e0f18ed8a0acc28cd7de4b435612a7ee7d81. * more stubbing * almost done * greentext? * my fingers are typing words --------- Co-authored-by: nomdéraisonnablementlong <you@example.com>
* Add AFK kicks back in Fixes the previous issues and also makes it a big window so users can close it / manually mark themselves as not being AFK now. * review * scar but im too lazy to apply suggestions and mess with commits * sane minimums * asd * review * augh * Fix afk minimum + requested admin bump * airhorn
* update FizzlePortals to use null user * CheckPortals method * subscribe to grid split event * summary to fizzle method
* Refactor build task configuration in tasks.json * Add legacy build task for dotnet in tasks.json * removed whitespace * removed prelaunch task * added description to new build task * added ignore for dev kit cache files for pre release Dev Kit version
* Update MagnetPickupSystem.cs * nearby
This reverts commit dffabf7.
This reverts commit 1000a7b.
…ixeltheaertist#143)" This reverts commit 48201fc.
* Update README.md with new links. (Pixeltheaertist#2) * Update README.md with new links. * Update README.md with Princess-Cheeseballs' provided links. Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> * Removed an extra space. Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> * Update actions_changelog_rss.py with the new domain. * Update stylesheet.xsl * Update SECURITY.md --------- Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> * fix (Pixeltheaertist#14) * Switch RT submodule to new repo (Pixeltheaertist#19) * Remove toggle action from winter coat (Pixeltheaertist#24) * i think i got them all * minor cleanup * init (Pixeltheaertist#13) * Bugfix: Moproach/spider solution regeneration (Pixeltheaertist#41) * moproach/spider solutions with recharge * mop mop mop roach * more straightforward moproach solution inheritance * Adds temperature protection to scarves (Pixeltheaertist#47) * Adds temperature protection to scarves * YAML conventions say specific stuff is better at the bottom * Remove scream action, replace with emote action (Pixeltheaertist#55) * no mroe screaming * if your angry and you know it scream with action grant! *clap clap* * emote action is more generic now * use flag instead * Revert "if your angry and you know it scream with action grant! *clap clap*" This reverts commit 7c40ee48 * screaming im screaming im screaming * reversed oops * Fix handheld grinders (Pixeltheaertist#50) * fix * TEST!!!!!!!!!! * comment * what * im so silly * explosion!!!!! * i hate tests * those can be asserts too * i hate tests * Replace all uses of System.Random with IRobustRandom, resolve all System.Random warnings. (Pixeltheaertist#32) * Remove all uses of System.Random * Use IRobustRandom in BinomialNumberSelector.Get * Remove remaining ToolRefinableSystem S.Random inst * Arcade sprite fixes & metadata cleanup (Pixeltheaertist#40) * arcade sprite & metadata cleanup * 4 space meta.json * Bring cargo order menu to the front when selecting a new item * Bugfix: Remove infinite board dupe in television/telescreen construction graphs. (Pixeltheaertist#42) * Fix telescreen/wallmount TV dupe * fix tagged icons * Initial commit (Pixeltheaertist#3) * Fix blankline after games rules (Pixeltheaertist#77) Annoyed me. * Fix illegible FileNotFoundError occurrences when git isn't in path. (Pixeltheaertist#6) * Update git_helper.py * Update git_helper.py * Update git_helper.py * Make borgs not RR (Pixeltheaertist#84) * Cargo integration tests update (Pixeltheaertist#18) * Updated Cargo Integration Tests * usings * revert NoCargoOrderArbitrage * unneeded ; * . * review requests * review requests v2 * Move server_fans.ogg to a SoundCollection (Pixeltheaertist#82) * quieter server fans * Restore individual parameter fields * Document Client, Server, and Shared files in folders starting with "K". Except microwaves. (Pixeltheaertist#91) * document the entire owl * Apply suggestions from code review Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Can cancel orders from the console you placed it on (Pixeltheaertist#11) * Make `InteractionTest` inherit from `GameTest` (Pixeltheaertist#90) * Make InteractionTest inherit from GameTest * Convert MousetrapTest to use some GameTest features * Document stubbed Setup method * LoadTestMap now sets TestMap like CreateTestMap * Maybe fix? * Oh, derp * Fix approval section on order labels always being "Self" (Pixeltheaertist#15) * Fixed label bug * review request * Add FixturesComponent to BaseWallmount (Pixeltheaertist#81) * BUI template (Pixeltheaertist#57) * Remove tasers from security locker fills (Pixeltheaertist#67) * Ambient Music fixes and tweaks (Pixeltheaertist#28) * reorganize yml * medical and engineering marker components and mass marking * bed * increase cooldown * did i leave that in * Renames all EntitySystem "ProtoMan" instances (Pixeltheaertist#100) * Remove "ProtoMan" instances * guess we're caching gases now * Microoptimize Vector2i.Offset (Pixeltheaertist#103) * microopt offset works on my machine award * tweaks * Fix event horizons using negative radius (Pixeltheaertist#105) Not even valid why is it NEGATIVE just use ZERO! * Fix ItemGridPiece using invalid sprite bounds (Pixeltheaertist#102) It inverted bottom and top. * Atmos category in the construction menu (Pixeltheaertist#94) * commit * move on over --------- Co-authored-by: iaada <iaada@users.noreply.github.com> * Space Law Revision (Pixeltheaertist#1) * Update SpaceLaw.xml * Update SLCrimeList.xml * Update SpaceLaw.xml to reflect AJCM-git's suggestion. * fixed (Pixeltheaertist#128) * Directional arrow (Pixeltheaertist#118) * arrow * yoink orginal arrow rsi * done * fixes * i just learnd about ignored components * Update Content.Client/DirectionalArrowIndicator/DirectionalArrowIndicatorComponent.cs Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> * customArrows * docs * more docs * teg and blue arrow * misc * fixes * remove color * imma dummy * meta * soon to obsolete * class not partial --------- Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> * Update RT to 277.2.0 (Pixeltheaertist#138) * Refactor RecipeManager to use LINQ and PrototypesReloaded (Pixeltheaertist#49) * small refactor RecipeManager and fix prototype reloading * wait... why is that here? * maybe? * Add section to link to space-wizards PR URL to PR template (Pixeltheaertist#143) * Construction menu recipe history (Pixeltheaertist#8) * Bugfix: Fix DrawDepth subfloor gap width, add gap for mapping subfloor layers (Pixeltheaertist#70) * Hide artifact effects from spawnmenu (Pixeltheaertist#149) * [FIX] Make slices of food fill out the space where the whole food used to be instead of dropping onto the floor (Pixeltheaertist#160) * Add NU1900 to WarningsNotAsErrors (Pixeltheaertist#171) * Removed duplicate function from solutions refactor in pricing system (Pixeltheaertist#164) * Hide virtual items in cryoUI (Pixeltheaertist#175) Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Add Integration test for ExpireIdCardComponent (Pixeltheaertist#162) Co-authored-by: Josh Greenslade <joshua.greenslade@onyxinsight.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> * Remove Staff of Entrance from Magic Event Spell (Pixeltheaertist#114) * fix atmosphere system protoman * Revert "Update README.md with new links. (Pixeltheaertist#2)" This reverts commit dffabf7. * Revert "Switch RT submodule to new repo (Pixeltheaertist#19)" This reverts commit 1000a7b. * Revert "Add section to link to space-wizards PR URL to PR template (Pixeltheaertist#143)" This reverts commit 48201fc. --------- Co-authored-by: Rem <GitRem@grifton.lol> Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Co-authored-by: riccardi48 <39341154+riccardi48@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Jessica M <jessica@jessicamaybe.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Minerva <218184747+mnva0@users.noreply.github.com> Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Kyle Tyo <akikai297@gmail.com> Co-authored-by: Connor Huffine <chuffine@gmail.com> Co-authored-by: portfiend <109661617+portfiend@users.noreply.github.com> Co-authored-by: rumaks <me@rumaks.xyz> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: āda <ss.adasts@gmail.com> Co-authored-by: iaada <iaada@users.noreply.github.com> Co-authored-by: ThatGuyUSA <thatguyusa123@gmail.com> Co-authored-by: InsoPL <lukasz.lindert@protonmail.com> Co-authored-by: AndrewFenriz <78079974+AndrewFenriz@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com> Co-authored-by: korczoczek <danielkorczok@gmail.com> Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: JoshGreenslade <joshgreenslade@gmail.com> Co-authored-by: Josh Greenslade <joshua.greenslade@onyxinsight.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: Rami <ramialanbagy@gmail.com>
* Set afk log level to info Forgor it defaults to debug. * verbose
…erance (#44390) * Increase NodeHSVTolerance * print out failing skin colour * Return old Epsilon value (move its comment up) * Update Content.Shared/Humanoid/SkinColorationPrototype.cs --------- Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
fix exception Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
* ShuttleNavControl: sensible map coordinates * Coords->Pos, ToWorldPosition vs. ToMapCoords.Posn
fix the hands
Revert " build task configuration fix (#43862)" This reverts commit 6aaac47.
* Sprite Fade Overlay Restricted to overlapping clickables
* Added an IgnoreClickableRestrict for larger objects, and put it on Anomaly Generator as an example
* Adjusting fade changes based on review
* double for avoid
* {
* fsnjhjasfhfsajkasfhj
---------
Co-authored-by: jessicamaybe <jessica@jessicamaybe.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
* EVA suit labeling * minor tweaks
Listen the error annoyed me okay.
* Workflow standardisation + prune dead runs * Also this
* Initial commit * Admin ghost/godmode immunity, inventory relay support * Alphabetize review
Update flake
* fix: GameDataScrounger properly ignores ignore-list * refactor: GDC to treat ignored files as abstract * fix: use wizden's fix for windows * refactor: check ignoredDir first for perf and readability
Changed the slowdown examine to not be inverted, so 0.25 is actually 25% and 0.75 is 75% and etc.
…camera (#44693) hotfix: camera against wall, baseutility is not
cghdghjkghdjaidgjshkagdfhjki
* Fix * Review
* fix mixing localization for vox hair * add missing localization for human facial hair * add missing localization for human hair * add missing localization for vulp hair & beards * spacing, for readability * fix mild mistakes
* stub * Revert "stub" This reverts commit c1204b88d3ae1bbdca2deeb075a9dd0d6c529326. * PoC * As a successful member of society with a stable unflinching psyche and limitless drive, natural affinity for finance and domination, you have been selected, no, you have been effortlessly guided by divine (biological) trauma towards this moment. The gates of destiny fling open, and once again you're left standing on pulsating nothingness. A strobing headache of the soul. * i feel bad * Revert "PoC" This reverts commit fafafac77f9cbd62497376c70e078e0155cb7ef6. --------- Co-authored-by: nomdéraisonnablementlong <you@example.com>
* add default skeleton sounds to skeleton species * add voices too
…ects (#44697) * nerf jaws of life sound * reagent grinder * fix fail oops
…mentVariants (#44687) * nullable placementVariants * Consistent xmldoc spacing * Nullable ItemDropPrototypeName
…4685) * PopupClient to PopupEntity/Coordinates * PopupPredictedX to PopupEntity/Cursor/Coordinates * The rest of the damn owl * nullability fixes * Buckle cleanup * cleanup, address PR comments * ExecutionSystem: one popup method * correct my filthy lies * Apply most of ajcm's suggestions * return user to SharedItemRecallSystem.cs * Fix lingering Ensnarable broadcast popups * targeted drain popups * fix lingering untargeted Guardian popups I read the comment on GuardianHostRecall. Oops. * target stethoscope popups * fix the PDA vibration popup * Fix target for encryption key removal popup * anomaly scanner: args.User, not uid * disposal unit comment, bcast pda vibration popup
smoother doafter anim
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
Bot
added
S: Merge Conflict
S: Untriaged
Changes: UI
and removed
S: Merge Conflict
S: Untriaged
size/M
labels
DaCookieCakes
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
About the PR
WizDen COMPLETE rebase part 1: Clean State.
Why / Balance
We're VERY far behind, and due to the big changes we'll need to do this in steps.
I'm starting this by making a new branch for our repo called "rebase", and will be pushing into that for now.
The next step will be porting content directly with minimal changes if possible.
After that I will overhaul our old systems.
Technical details
Yes
Media
Requirements
Breaking changes
Changelog