Skip to content

Delta v cherry picks#77

Merged
Sage-Jones merged 7 commits intoQuantumBlueSS14:masterfrom
Sage-Jones:Delta-V-cherry-picks
Oct 18, 2025
Merged

Delta v cherry picks#77
Sage-Jones merged 7 commits intoQuantumBlueSS14:masterfrom
Sage-Jones:Delta-V-cherry-picks

Conversation

@Sage-Jones
Copy link
Collaborator

About the PR

Porting in many a feature from Delta-V! Here's a list of the PRs I'm cherry picking, note that some have been modified and not perfectly picked.

DeltaV-Station/Delta-v#4099 (only randomized siphoning damage)
DeltaV-Station/Delta-v#4189
DeltaV-Station/Delta-v#4207
DeltaV-Station/Delta-v#4210
DeltaV-Station/Delta-v#4226
DeltaV-Station/Delta-v#4208
DeltaV-Station/Delta-v#4193
DeltaV-Station/Delta-v#4130
DeltaV-Station/Delta-v#4213
DeltaV-Station/Delta-v#4147 (only porting prediction and animated glyphs from this)
DeltaV-Station/Delta-v#4232
DeltaV-Station/Delta-v#4140
DeltaV-Station/Delta-v#4247
DeltaV-Station/Delta-v#4235
DeltaV-Station/Delta-v#4216
DeltaV-Station/Delta-v#4211
DeltaV-Station/Delta-v#4117
DeltaV-Station/Delta-v#4277 (the year is 5838)
DeltaV-Station/Delta-v#4196 (only medical belts hold syringes now, but don't start with them like in the pr)
DeltaV-Station/Delta-v#4290
DeltaV-Station/Delta-v#4273
DeltaV-Station/Delta-v#4348
DeltaV-Station/Delta-v#4315
DeltaV-Station/Delta-v#4367
DeltaV-Station/Delta-v#4393
DeltaV-Station/Delta-v#4364
DeltaV-Station/Delta-v#4464
DeltaV-Station/Delta-v#4375
DeltaV-Station/Delta-v#4329
DeltaV-Station/Delta-v#4318
DeltaV-Station/Delta-v#4424
DeltaV-Station/Delta-v#3931
DeltaV-Station/Delta-v#4336
DeltaV-Station/Delta-v#4319
DeltaV-Station/Delta-v#4274 (Librarians name remains unchanged, and they remain a service role, but with epistemics access and communications)
DeltaV-Station/Delta-v#4477
DeltaV-Station/Delta-v#4312
DeltaV-Station/Delta-v#4419
DeltaV-Station/Delta-v#4482
DeltaV-Station/Delta-v#4341
DeltaV-Station/Delta-v#4385
DeltaV-Station/Delta-v#4440 (shadow renamed to metaphysical, and holy renamed to soul)
DeltaV-Station/Delta-v#4451
DeltaV-Station/Delta-v#4445
DeltaV-Station/Delta-v#4452
DeltaV-Station/Delta-v#4437
DeltaV-Station/Delta-v#4377
DeltaV-Station/Delta-v#4462 (only for musician, and only 100 hours of musician required)
DeltaV-Station/Delta-v#4493
DeltaV-Station/Delta-v#4463
DeltaV-Station/Delta-v#4480
DeltaV-Station/Delta-v#4359
DeltaV-Station/Delta-v#4505
DeltaV-Station/Delta-v#4515

Why / Balance

Refer to the individual PRs!

Technical details

Also refer to the individual PRs.
Noteworthy- our clothing grant component is just that, not a "clothing grant component component", so in yaml use its just "ClothingGrant" not "ClothingGrantComponent"

Media

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

@github-actions
Copy link
Contributor

github-actions bot commented Oct 17, 2025

RSI Diff Bot; head commit eec0a5b merging into 744f1f3
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_DEN/Mobs/Customization/Hair/hairdoppler.rsi

State Old New Status
hair_amazon Added
hair_astolfo Added
hair_baum Added
hair_beachwave Added
hair_bluntbangs Added
hair_bluntbangs_alt Added
hair_braided_front Added
hair_braided_sidetail Added
hair_bunhead4 Added
hair_combed Added
hair_combedbob Added
hair_cotton Added
hair_cottonalt Added
hair_curly Added
hair_dave Added
hair_diagonal_bangs Added
hair_diagonal_bangs_alt Added
hair_dreadlocks_long Added
hair_firestarter Added
hair_fluffy_bangs Added
hair_fluffy_short Added
hair_fortuneteller Added
hair_fortuneteller_alt Added
hair_froofylong Added
hair_geisha Added
hair_gentle_bun Added
hair_gentle_duo_bun Added
hair_glammetal Added
hair_gloomy_long Added
hair_gloomy_longer Added
hair_gloomy_medium Added
hair_grande Added
hair_hairfre Added
hair_halfcut Added
hair_halfcut_rough Added
hair_holo_tuber Added
hair_hyenamane Added
hair_impish Added
hair_jay Added
hair_jessica Added
hair_kajam Added
hair_lila Added
hair_long4 Added
hair_longdtails Added
hair_longovereye_alt Added
hair_longsidepartstraight Added
hair_loose_slicked Added
hair_mcsqueeb Added
hair_mediumbraid Added
hair_mermaid Added
hair_mia Added
hair_mohawkshort Added
hair_newyou Added
hair_phoenix Added
hair_phoenix_half_shaven Added
hair_poofy Added
hair_punktails Added
hair_quadcurls Added
hair_ring_tails Added
hair_rowbraid Added
hair_rowdualtail Added
hair_royal_curls Added
hair_runner Added
hair_runner_bun Added
hair_sabitsuki Added
hair_scully Added
hair_short_tassles Added
hair_shy Added
hair_sleaze Added
hair_slightlymessy Added
hair_spicy Added
hair_spikey Added
hair_spikey_long Added
hair_stacy Added
hair_stacy_bun Added
hair_strict Added
hair_strict_long Added
hair_strict_short Added
hair_toriyama Added
hair_tri_bun Added
hair_tri_bun_long Added
hair_twintail Added
hair_violet Added
hair_violet_ponytail Added
hair_viper Added
hair_volajupompless Added
hair_ziegler Added
hair_zoey Added
halfshave_glamorous Added
halfshave_long Added
halfshave_messy Added
halfshave_messylong Added
inari Added

Resources/Textures/_DV/CosmicCult/Objects/glyph_blades.rsi

State Old New Status
cooldown Added
despawning Added
spawning Added

Resources/Textures/_DV/CosmicCult/Objects/glyph_cessation.rsi

State Old New Status
cooldown Added
despawning Added
spawning Added

Resources/Textures/_DV/CosmicCult/Objects/glyph_knowledge.rsi

State Old New Status
active Added
cooldown Added
despawning Added
spawning Added

Resources/Textures/_DV/CosmicCult/Objects/glyph_projection.rsi

State Old New Status
despawning Added
spawning Added

Resources/Textures/_DV/CosmicCult/Objects/glyph_truth.rsi

State Old New Status
active Added
cooldown Added
despawning Added
spawning Added

Resources/Textures/_DV/CosmicCult/Objects/glyph_warding.rsi

State Old New Status
cooldown Added
despawning Added
spawning Added

Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/cybersunstealth.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET Added
on-equipped-HELMET Added

Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/cybersunstealth.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after eec0a5b

Sage-Jones and others added 4 commits October 17, 2025 22:41
…ontributing into Delta-V-cherry-picks

# Conflicts:
#	Resources/Prototypes/_DV/CosmicCult/glyphs.yml
#	Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml
* 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

# Conflicts:
#	Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hardsuit-helmets.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
#	Resources/Prototypes/_DV/CosmicCult/glyphs.yml
@Sage-Jones Sage-Jones merged commit 70e78b3 into QuantumBlueSS14:master Oct 18, 2025
12 of 14 checks passed
@Sage-Jones Sage-Jones mentioned this pull request Oct 25, 2025
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants