Upstream sync #216
Merged
Upstream sync #216
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
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Add snow tile edges * Changes for edge tile prio * Add support for tile weightlessness * Add weightlessness to ice * snow duggy moments * fix ice thing yeah * actually why even use weightless movement * upd8 nukieplanet * i have no idea what im doing * sprite modifications
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Kevin Zheng <[email protected]>
* tasty silk and webby crates * winter coat * fuck * Move some files around and stuff * FUCK * Web closet finished * what the fuck * brain empty * loss * loss 2 * fuck * web typing indicators * minor spelling mistake, I lost. * hiss * changed * And they said "Let's remove pockets", funniest shit I've ever heard. * 2 seconds of stun * fuck it we pr * resprite * dummy * arachnid creampie sprite * different + more "natural" crate sprites * Webbing suits and webbing dresses. * and other stuff I forgot to commit. * and gone. * no * Cloth. * I forgot to commit this? What??? * Eyes. * Comment trimming * winter coat resprite
* Add moth plushie Moth plushie. It's cute, don't mind, merge it. * Update toys.yml
# Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
Rxup
approved these changes
Sep 5, 2023
Roudenn
pushed a commit
to Roudenn/space-station-14
that referenced
this pull request
Jan 25, 2025
* More scarfs (Rxup#216) * Sprites + Colored Scarf Implimentation Doesn't include into quickthreads or other clothing vendors * File Paths are important * Metas, items exist, winterdrobe I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk * File Path Fix * Typo fix * Resolved merge conflict * Moved scarves around * Moved scarf textures out of the _CD directory * Removed final CD folder * Removed extra scarfs * Removed extra scarfs, again * Replaced ClothingNeckBase with ClothingScarfBase --------- Co-authored-by: PursuitInAshes <[email protected]> Co-authored-by: TakoDragon <[email protected]>
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.
No description provided.