Merge upstream 2025-01-31 #33
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
…s (#34396) * Added key and missing details from worn cape to HOP bedsheet * Corrected canvas size for sprite * Subtle tweak to shading to reduce color blurring at pillow edge * Matched Hue and tone to cape * Tweak chekered pattern marks for gold trim * Removed accidental palette inclusion * Clearer wording and corrected attribution name. * Tweaked shading on key image to fit in better with bed aesthetics * Added CE cape icon to bedsheet * Added cape image to HOP bedsheet. Made gold trim better match cape visuals * RD cape icon added. Colour tweaked to better match cape. * Updates json * Tweaks to gold trim shading to match bed aesthetics * Added better shading for HOP sheet side. Halved file size. * Optimised HOS RD and CE sheet sprites * Corrected sprite title in attribution
Replaced Adv kits with 2 combat kits
* Fixed nonsense RegEx "-" character is a range, caused an error. No need for "," to repeat so much, it's not a separator. "\\" - just why? * Further optimized RegEx structure Added: "@" delimiter for consistency "/" to escape "-" for good and to avoid further problems
remove the ability to print the station anchor circuit board
* Fixed major issues with power, cargo shuttle docking, etc. * remove serialized invalids * Finished fixing the critical issues, ready for merge? * Empty commit * Added new break room to sci (they deserve it) * Fixed up other minor issues * if this map isnt PERFECT Emisse has permission to gib me and turn me into a cyborg * added Roomba's changes --------- Co-authored-by: ArtisticRoomba <[email protected]>
* make insert and eject datafields in ItemSlotsComponent.cs nullable, make mime PDA silent * make it so that you can't fit wirecutters into the slots, among other various things
* Added smite machine to YAML * Added smite ads and inventory * Added smite vendor sprites * Changed the description of the machine to not repeat and ad line. * Added newline to end of inventory .yml * Corrected erroneous edit. * Tweaked all sprites * Added tesla toy to contraband. Reduced number of drinks available * Reduced soda varieties but increased can numbers. * Removed tesla toy from contraband inventory * Removed speech component from vending machines that already inherit it * Moved Sprite component to top of list * Added Smite vendors to random spanwers * Alphabetised spawn prototypes, commented where name is unclear
* Bedsheets * that one fixes yellow bedsheet and delete american bedsheet
Update anomaly.yml
* Remove baby jail Closes #33893 * Test fail fix.
… (#34406) Good for: - Keeping admins hidden - Not confuse players seeing 84/80 players Nicely pairs up with the ``admin.admins_count_for_max_players`` ccvar
* Fix Mixed puddles not updating slips when evap * Remove Comment that isn't needed Co-authored-by: Centronias <[email protected]> * CR - use SolutionContainerSystem.UpdateChemicals * CR - cleanup unused imports --------- Co-authored-by: Centronias <[email protected]>
* Fix DNA scrambler updating station record * Update Content.Server/Implants/SubdermalImplantSystem.cs --------- Co-authored-by: slarticodefast <[email protected]>
* small fixes * eee
* Juice that makes you go boom * moved explosive juice to fun yml - fixed ExplosionReactionEffect.cs not having TileBreakScale parameter - made Drazil plushie major contraband (they are evil!!!!!) * removed JASON!!!! JASOOON!!! JASON!!! * don't do commits at 1am * Update fun.yml fix ident * no more bullying the server (only 1 explosion)
Adjusts the size of ginormous scrap to fit in bags of holding
* first commit * opps * Reset cooldown instead * Added ccvar * Not replicated!
Particle Acceleratir fixed Co-authored-by: VideoKompany <[email protected]>
* serializable idk * guh
* Pass user to effects to properly fix double muzzle flash. * Use gun when user is null. * Update MuzzleFlashEvent.cs * Update MuzzleFlashEvent.cs * Update GunSystem.cs * Update SharedGunSystem.cs * Update MuzzleFlashEvent.cs * Update SharedGunSystem.cs * Update SharedGunSystem.cs * Update Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs Co-authored-by: Leon Friedrich <[email protected]> --------- Co-authored-by: Leon Friedrich <[email protected]>
* fix * oh right
* Add struct for holding historical data on cargo bounties * Add localisation strings for bounty history * Add new XAML entry for display bounty history * Expand cargo bounty menu to include tabs * Ensure station databases hold historical bounty data * Add to the bounty history when removing one from active * Feed bounty history into cargo's bounty system * Move tab title setting to constructor * Remove redundant access specifications * Remove un-needed override * Fixup BountyHistoryEntry backing code * Fix formatting in CargoBountyMenu * Reformat BountyHistoryData * Rework TryRemoveBounty to use new Entity type * Add Enum for showing bounty results * Rework look and feel of History tab * Add visible text when no bounties have been completed yet * Remove control * Swap default to null * Reverse ordering of bounties so last entry comes first * Remove redundant Visible * Move enum docs into the enum
* kammerer ammo, firerate and comment * bulldog description * enforcer description and comment * DB and sawn-off firerate parity, sawn-off comment * description changes * reduce kammerer firerate again
* Implant cleans itself up on draw - add an event to relay to an implant that it's being drawn, to tell it to clean itself up - Give Fake mindshield a cleanup method, to remove the component added fixing a problem where the icon persists after implant draw * Remove extra whitespace * CR Switch to using ContainerRemovedMessage
* Adds single clap emote * Adds missing single clap loc * Adds void blink effects, sound, and sprite * Adds VoidApplauseEvent and implements it into the Magic System and Grimoire * Removes commented Spawn code in Shared Magic System. Adds comments to replace pointlight with a negative light in the future. * Makes spells Mono * Changes to swap positions. * Makes Void Applause target body only * Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs Co-authored-by: slarticodefast <[email protected]> * Update Content.Client/Magic/MagicSystem.cs Co-authored-by: slarticodefast <[email protected]> * Update Resources/Audio/Effects/Emotes/attributions.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/SoundCollections/emotes.yml Co-authored-by: slarticodefast <[email protected]> * Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs Co-authored-by: slarticodefast <[email protected]> * Removes duplicate effect spawning from server * Puts Void Applause effect on server, lets lizards hear clap * Adds single clap to diona --------- Co-authored-by: slarticodefast <[email protected]>
* Initial commit * Updated * Finished changes * made the minefield signs outside sec much more visible to stop your skill issue.
* initial commit * Initial commit * fixed some things * Finished changes
github-actions
bot
added
Changes: Sprites
Changes: Map
Changes: UI
Changes: Audio
labels
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.