Delta v cherry picks#70
Merged
Sage-Jones merged 54 commits intoQuantumBlueSS14:masterfrom Oct 11, 2025
Merged
Conversation
* half cap half fire rate * wielding * fake pr to see something * revert fake pr meow
mindbreak ops...
bluespace ewwww
* port harmony back shield deleted account made commit 💔 eyeballing this fr * alert procedure ops # Conflicts: # .wiki/_DV/Laws/AlertProcedure.txt
* about to break this all * event goidacode * cleanup * cleanup 2 * cleanup 3 * cleanup 4 is it even worth bothering with these descriptions. added newline to end of a couple files * single extra space WAUGH * toggleable + minor cleanup * that was reverted already what why did merge conflict editor add in a line that isn't even present on master?? huh??? * fixops GlimmerSystem looks like That to avoid extraneous network events being raised if something is attempting to push glimmer over 1000
* Replace colossus briefing sound * Voice override for cult armor * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Why do I keep forgetting those --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> # Conflicts: # Content.Server/_DV/CosmicCult/CosmicCultSystem.cs # Resources/Prototypes/_DV/CosmicCult/Clothing/cosmiccult_armor.yml
* Refactoring in progress * Refactoring completed, proceeding to animate a ton * Don't commit that idiot * Ballin * Actually use the animations I made * More sprites * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Change a lot of stuff * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Hopefuly finish changing stuff * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Prototype * Change sprites * Fix test fail * Cessation sprites * warding * Add sounds * Typo * Projection * Truth * Knowledge * Fix being able to convert SSD peeps * Add interaction outline because why the hell not * Change stuff * Surely this won't explode --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> # Conflicts: # Content.Server/_DV/CosmicCult/CosmicCultSystem.cs
* oh my god * I FIXED IT genuinely this is insane
* Combo attacks when * Remove stuff # Conflicts: # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
* Our cult so cosmic * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add more gambling * Change stuff * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Use EntityQuerry (what is that even for) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Not how it works apparently --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* * fix station beacons not showing up sometimes (typically the custom named ones) upstream issue: space-wizards/space-station-14#3769 * Lady Elegance: remove duplicate station beacons * Review requests: simplify beacon bugfix, remove map changes * comments
* Adds a toggle power sink port to the robotic arm * Created babys first componenet, the toggle power link port is not a componenet (PowerTogglePort) Wow! * Update PowerTogglePortComponent.cs Deltanedas special QuantumBlueSS14#1 Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> * Update PowerTogglePortComponent.cs susnedas Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> * Update PowerTogglePortComponent.cs sus Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> --------- Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com>
* there was a blacklist the whole time * remove the line Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com> --------- Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
…(#4273) * Simple fix * maintainer requested changes
* Fix EvenHealing on bodyParts (#1469) <!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline --> <!-- NOTE: All code submitted to this repository is ALWAYS licensed under the AGPL-3.0-or-later license. The REUSE Specification headers or separate .license files indicate a secondary license (e.g., MPL or MIT) solely to facilitate integration for projects that do not use the AGPL license. This secondary license does not replace the fact that AGPL-3.0-or-later remains the primary and binding license. Uncomment and modify the following line if you wish to change the license from the default of AGPL.--> <!--- LICENSE: AGPL --> <!-- What did you change? --> Fixed EvenHealing not working on limb damage when there was no general damage. <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. --> When you had a massively burned victim, healing them via aloxadone would heal their general damage, and each limb profited half of that general healing. However, as soon as the general damage was healed, Aloxadone wasn't outputting any healing anymore, since even healing is dependent on damage types on the general damage - And thus, with no healing, the limbs couldn't benefit anymore. This is wrong. I fixed it. <!-- Summary of code changes for easier review. --> Separated the healing of the general damage and limb damage, they are independent of each other. Healing General Damage won't heal limb damage and vice versa. Added a way to heal each limb specifically. I tested it thoroughly, and generally, it worked. Either with multiple different damage types, or just one. Multiple damage parts, or just one. Very much encourage to find a more elegant technical solution. <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. --> I can't do videos, but videos would be required. Please try it out yourself. <!-- Confirm the following by placing an X in the brackets [X]: --> - [X] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). - [X] I have added media to this PR or it does not require an ingame showcase. - [X] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content. <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion --> <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Changelog** <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay. Make sure to read the guidelines and take this Changelog template out of the comment block in order for it to show up. Changelog must have a 🆑 symbol, so the bot recognizes the changes and adds them to the game's changelog. --> 🆑 - fix: Fixed Chemicals with the EvenHealing attribute to not work on patient's limbs without General Damage. Aloxadone will now finally heal the burned Salvager's limbs. * Fix Port to Delta * Fixes * Made comments even more commenty? Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> * Update Content.Shared/Damage/Systems/DamageableSystem.cs Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com> Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> * Add Comments * Update Content.Shared/EntityEffects/Effects/EvenHealthChange.cs Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com> Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> * Update Content.Shared/Damage/Systems/DamageableSystem.cs Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com> Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> * Fix Comments * Update Content.Shared/EntityEffects/Effects/EvenHealthChange.cs Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com> Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> * commenty commenta WHEN DO THE COMMENTS END --------- Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com> Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
* Add recharge component to Force Wall * Make "time til recharge" string easier to read * Fix Force Wall name * Fix Force Wall name * Update Resources/Prototypes/Magic/forcewall_spells.yml Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com> Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com> * Update Resources/Prototypes/Magic/forcewall_spells.yml Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com> Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com> * Update Resources/Prototypes/Magic/forcewall_spells.yml Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com> Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com> * Update Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com> Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com> --------- Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com> Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
* allow ghosting if mind swap or telegnosis goes wrong * Review comment update Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs Co-authored-by: Tobias Berger <toby@tobot.dev> Signed-off-by: Charlie Morley <cmorley191@gmail.com> --------- Signed-off-by: Charlie Morley <cmorley191@gmail.com> Co-authored-by: Tobias Berger <toby@tobot.dev>
* Introduce ClothingSlowResistance * Buff Onis * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Fix Shotgun ammocount not updating (#40568)
[PORT] Anomalites from Impstation
People with the Numb trait no longer scream during surgery
Make Augments more accessible
* copy paste ops * no attribution allowed here no siree * lgtm * direction didnt mention caustic get 1984'd * Update uplink_catalog.yml * ftlops # Conflicts: # Content.Shared/_Goobstation/Clothing/Components/ClothingGrantTagComponent.cs # Content.Shared/_Goobstation/Clothing/Systems/ClothingGrantingSystem.cs
Change parent type on entity
* aaaaaaaaaaaaaaaaaaa * add shadow damage to some evil things and add ways to heal it * bibles healing shadow doesn't work for some reason * fix attribution, description, and remove placeholder sprite # Conflicts: # Resources/Locale/en-US/_DV/damage/damage-types.ftl # Resources/Locale/en-US/_DV/store/uplink/weaponry.ftl # Resources/Prototypes/_DV/Catalog/Uplink/weaponry.yml # Resources/Prototypes/_DV/Damage/modifier_sets.yml # Resources/Prototypes/_DV/Damage/types.yml # Resources/Prototypes/_DV/Entities/Clothing/Head/hoods.yml
Allows [mono] to be used in records (#751) Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com>
give ipc access to humanoid emotes again (accidentally lost in april 2025 upstream merge) Signed-off-by: William Lemon <William.Lemon2@gmail.com> Co-authored-by: William Lemon <William.Lemon2@gmail.com> # Conflicts: # Resources/Prototypes/_EE/Voice/speech_emotes.yml
…ng from upstream (#4452) * Change 'Departamental' to 'Departmental' * Undo typo fixes for comments * Add pipe layering * Add the pressure release valve * Add the pressure release valve * Fix the gas pump * Fix the signal valve appearing thrice * Fix the signal valve appearing thrice --------- Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> # Conflicts: # Resources/Prototypes/Recipes/Construction/utilities.yml
* Makes tape recorders signal-compatible * Removes accidental line
* Adds lights to more hologram projections * Untouches the line in question
* Free Super synths for those who have suffered like I have. * Update instrument_keyed.yml * Update meta.json * Update meta.json * Doubled Playtime because I realized that 100 hours is not long enough considering that musicians are almost always being played on delta. Doubled playtime for obvious reasons, also because 100 hours was not evil enough. * Comment moment. * I think this is the fix, please yell at me if it isnt deltanedas. * comments... * comment stuff 2 * messing with stuff, one sec. * testing... * i hate it here, may have finally fixed the bullshit with indents * requested changes * Requested Changes
* agony * removed junk from jetbrains rider having a stroke and adding random shit * Upgrades the soundfont to the full version of GeneralUserGS.
* Make more objects spray paintable (Reviving #31328) (#37341) * PaintableAirlockComponent and AirlockGroupPrototype have been replaced * Slightly redesigned SprayPainterSystem for greater versatility * Added handling of changes to the appearance of doors and storages * PaintableGroup prototypes have been created * Generating tabs with styles in the UI * Fix error with undiscovered layer * Slight improvement * Removed unnecessary property * The category for `PaintableGroup` was allocated to a separate prototype so that the engine itself would check if the category existed * Added canisters, but repainting doesn't work * Added localization to styles * Fix sprite changing * Added the ability to paint canisters * slight ui improvement * Fix yamllinter errors * Fix test * The UI now remembers which tab was open * Fix build (?) * Rename * Charges have been added to the spray painter * Added a charge texture for the spray painter * Now spray painter can paint decals * Increased number of charges * Spawning dummy objects has been replaced by PrototypeManager * added a signature about the painting of the object * fix * Code commenting * Fix upstream * Update Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> * review * Now decals can only be painted if the corresponding tab in the menu is open. * Fixed a bug with pipe and decal tabs not being remembered * Update EntityStorageVisualizerSystem.cs * record * loc * Cleanup * Revert electrified visuals * more cleanup, fix charges, del ammo4 * no empty file, remove meta component * closet exceptions, storage visualizer fixes * enable/disable decal through alt-verb * Fix missed merge conflicts * fix snap offset, button event handlers * simpler order, fix snap loc string * Remove PaintableViz.BaseRSI, no decal item, A-Z * State-respecting UI, BUI updates, FTL fixes * revert DecalPlacerWindow changes * revert unwanted changes, cleanup function order * Limit SprayPainterAmmo write access to AmmoSystem * Remove PaintedSystem * spray paint ammo lathe recipe, youtool listing * category as a list, groups as subtabs * Restore inhand copyright in meta.json * empty spray painter, recipe produces an empty one * allow alpha on spray painter decals * add comments * paintable wall lockers * Restrict painting more objects * Suggested event changes, event cleanup * component comments, fix ammo inhands * uncleanable decals, dirty styles on mapinit * organize paintables, separate emergency/closet grp * fix categories newline at EOF * airlock group whitespace cleanup * realphabetize * Clean up EntityStorageViz merge conflict markers * Apply requested changes * Apply suggestions from sowelipililimute's review Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> * betrayal most foul * Remove members from EntityPaintedEvent * No emerg. group, steelsec to secure, locker/closet * Enable repainting the medical wall locker * comments, no flags on PaintableVisuals * Remove locked variants from closets/wall closets * removable decals * off value consistency * can't paint away those bones * fix precedence * Remove AirlockDepartment, AirlockGroup protos Both unused. * whitelist consistency re: ammo component * add standing emergency closet styles * alphabetize the spray painter listings --------- Co-authored-by: Ertanic <black.ikra.14@gmail.com> Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com> Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> * Adds stencil lettering to the spraypainter (#39701) * adds stencil lettering to the spraypainter * update decal IDs to match convention * Add Serializable, NetSerializable attributes to DecalPaintMode (#38921) Serializable, Net" on DecalPaintMode * Fixes my mistakes and adds DV compat * Adds DV-specific stuff * Makes Our Names Not Use This Case * Comments xeno stuff we do not have * RD is dead. Long live the Mystagogue --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Ertanic <black.ikra.14@gmail.com> Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com> Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> Co-authored-by: Alkheemist <alkheemist@gmail.com> # Conflicts: # Content.Shared/SprayPainter/Components/SprayPainterComponent.cs # Resources/Locale/en-US/spray-painter/spray-painter.ftl # Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml # Resources/Prototypes/Paintables/airlock_groups.yml # Resources/Prototypes/Paintables/locker_groups.yml
miniscule tweakops
…neck. (#4505) * I hate it here * Update instrument_keyed.yml * fixed finally
github-actions
bot
added
size/L
Changes: YML
Changes: Audio
Changes: Localization
Changes: C#
Changes: Documentation
Changes: Sprite
Changes: UI
Changes: Shaders
and removed
size/L
labels
Contributor
|
RSI Diff Bot; head commit 90b6f38 merging into 20268f5 Resources/Textures/Objects/Misc/id_cards.rsi
Resources/Textures/Structures/Piping/Atmospherics/pump.rsi
Resources/Textures/Structures/Piping/Atmospherics/pump_alt1.rsi
Resources/Textures/Decals/stencil.rsi
Resources/Textures/Objects/Fun/Instruments/h_synthesizer.rsi
|
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
18 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
Various cherry picked ports from Delta-V. Super merge if you will, although it's not technically merging.
Why / Balance
n/a
Technical details
Sorry I gotta merge this quickly to test it on the server. Someone remind me to fill this out later.
Media
Requirements
Breaking changes
Maybe?
Changelog