Skip to content

Pull from vx#1854

Merged
fenndragon merged 134 commits into
masterfrom
pull-from-VX
May 19, 2026
Merged

Pull from vx#1854
fenndragon merged 134 commits into
masterfrom
pull-from-VX

Conversation

@fenndragon
Copy link
Copy Markdown
Collaborator

About the PR

Why / Balance

Technical details

How to test

Media

Breaking changes

Changelog

Kronyxxx and others added 30 commits May 6, 2026 04:18
chore(sanitization): port cleanup and content removals to main
Update RobustToolbox submodule pin from 4b04081 to 46a56ce (v276.0.0).
This matches the engine commit referenced by upstream Wizden content.
Engine-only change; no VRS code modifications in this commit.

Notable upstream items in this range (fixes/perf/platform):

- Fix cross-grid collisions (#6542)

- Fix SetCoordinates causing unexpected reparenting (#6533)

- Fix BUI EntitySystem injection (#6515)

- Fix TryGetEntitySystem/GetEntitySystemOrNull on uninitialized manager (#6512)

- Fix bad cast syntax with IRobustCloneable field deltas (#6536)

- Catch NetEncryption exceptions (#6498)

- Always clean up render handle state after overlay draws (#6508)

- Fix ScrollContainer measure invariant (#6494)

- HRTF support through openal-soft (#6511)

- Allow hex colour input (#6485)

- Allow static abstract through the sandbox + INumber (#6432)

- Make IDependencyCollection constructable (#6466)

- Expose more fields on AudioComponent (#6510)

- record bandwidth usage on release (#6545)

- More comprehensively tag auto-generated code (#6541)

- Add parent check debug assert in SharedContainerSystem.Insert (#6532)

- Fully remove obsolete methods in MapGridComponent (#6476)
Cherry-picked from space-wizards/space-station-14 commit 787330f5c6
to bring VRS in line with upstream's v269+ build system (required for
RobustToolbox v276.0.0 already pinned on this branch).

Includes:
- New MSBuild/Content.props imported by all content csprojs.
- Switched all content csprojs from direct ProjectReference of Robust
  components to upstream's Imports/*.props mechanism.
- Replaced SpaceStation14.sln with SpaceStation14.slnx.
- Various small content code adjustments to align with new RT APIs
  taken verbatim from upstream.
- Added DepsHandler for ServerPackaging.

VRS-specific resolutions:
- Sanitization-deleted upstream files (Codewords, EdiblePrototype,
  SmartFridgeComponent, ObjectiveCommandsTest) kept deleted.
- Preserved VRS-only csproj items (Folder Includes, .CM14 globs,
  Goobstation Compile Includes, Configurations/Platforms, DebugOpt).

VRS:
Mechanical fixes for analyzers that became stricter under RobustToolbox v276:

- RA0017 (DataDefinition must be partial): added 'partial' modifier to 22
  prototype/component types across DV/Mono/Funky/Goob/NF/RMC/Emberfall/Shitmed
  and core (RCDPrototype, PsionicsRecord, NanoTask*, NanoChat*).
- RA0020 (DataField property needs setter): added '{ get; private set; }'
  (or replaced 'init;' with 'set;') on prototype ID/Parents/Abstract/etc.
  across Cargo, DV, Goob, NF, Silicons, StatusIcon, Roles, InteractionVerbs,
  Nyanotrasen Kitchen, BorgType.
- RA0032 (duplicate [Dependency] field): in SharedBodySystem partials,
  removed Shitmed-side duplicate _gameTiming/_prototypeManager/_damageable
  declarations and rewired call sites to use the upstream-side
  _timing/Prototypes/Damageable fields. VRS comments mark the rewires.

VRS:
…s (8 files)

Snapshot before pivoting to upstream merge strategy. Not for upstream PR.

MapGrid: ported instance methods to SharedMapSystem on Entity<MapGridComponent>
  in Content.Shared (TurfHelpers, Anchorable, Anomaly, Interaction,
  MoverController, Biome, Construction, NearbyTilesPercent).

Sanitization-fallout: removed dead 'using Serilog/Linguini/FloofStation' and
  dead VoreSystem dep; switched JobWhitelistManager to ISawmill and
  PlantSpeciesChange to Robust Logger.
Phase 2A cleanup. v269 build system no longer transitively pulls these
packages, but the imports were never actually used.

- Content.Client/_Crescent/PointCannons/TargetingConsoleBUI.cs: drop unused
  'using OpenToolkit.GraphicsLibraryFramework;'
- Content.Client/_Floof/Examine/CustomExaminePart.xaml.cs: drop unused
  'using Serilog;'

Content.Client now compiles clean.
- add compatibility shims for removed MapGridComponent instance APIs
  (TileIndicesFor, GridTileToLocal, TryGetTileRef, GetAnchoredEntities,
  GetAnchoredEntitiesEnumerator, GetLocalTilesIntersecting, WorldToLocal)
- add compatibility shims for removed EntityUid timer helpers and
  ContainerManager.TryGetContainer
- resolve remaining RA0032 duplicate [Dependency] fields across partials
- fix final map-component using/import callsites

Build status after this commit:
- Content.Server: 0 errors
- Content.Shared: 0 errors
- Content.Client: 0 errors
- Content.Replay: 0 errors
… + main merge

- Remove duplicate PlushieCarp keys in cuddlycritter vending inventory
- Remove orphan trait block (no id) referencing HornyMoodsTarget
- Delete Floof/Catalog/Fills/Crates/lewd.yml (parent CrateLewd missing)
- Truncate hellspawn.yml dangling Fatkid component bleed
- Convert _CM14 base UserInterface.interfaces to dict form (RT v276)
- Delete ActionLewdLayEgg (event type missing)
- Repoint Meditech PDAs to Objects/Devices/pda.rsi
- Delete _HL neuralyzer.yml (Brainwasher component missing)
- Remove orphan Brainwasher block in base_borg_chassis.yml
- Drop ClothingEyesNeuralyzer from passiondrobe contraband
- Remove ClothingNeckMantleMeditech (sprite missing); fix sectorenclave->duskenclave mantle ref
…/07; fix Timer/Drakeborn; restore minimal companies.yml

- Remove 39 Meditech/SectorEnclave entity blocks (FORK_PLAN/07 says cut)
- Remove orphan ClothingOuterHardsuitInderdyne* hardsuits
- Clean construction graph nodes/edges for deleted posters
- Add migration aliases PosterContrabandMeditech -> PosterContrabandFreeTonto, PosterSectorEnclave -> PosterContrabandFreeTonto so existing maps load
- Fix BorgModuleTopicaks -> BorgModuleTopicals typo in hl_migration.yml
- Remove '- type: Timer' lines (TimerComponent removed in RT v276)
- Remove DrakebornComponentOnSpawn override rule (HLDrakeborn component missing)
- Restore minimal companies.yml (None + admin + canon vanilla) so lobby UI doesn't crash with empty CompanyButton
- Remove SexEmotes/LewdSounds component from base species (parent fix; -43 errors)
- Restore Floof alcohol reagent locale (.ftl) deleted by NSFW cleanup but with surviving reagent prototypes
- Restore minimal consentToggle stubs (Aphrodisiacs, NSFWDescriptions, NonconIcon) referenced by C# code
- Strip orphan Lewd*/Whip*/Spank*/Dildo* refs from misc lockers, passiondrobe inventory, boozeomat, food/fun crates, drink spawners
- Strip orphan PlushieVytian, PlushieRemiie, PlushieCarp variants
- Redirect HL Quad borg jobs to PlayerBorgBattery (custom borg entities deleted)
- Replace _HL borg_types.yml BorgChassisSecurity ref with BorgChassisQuadSec
- Drop MobDragonDrakeborn polymorph entry
- Delete _HL character_override_rules.yml (HL-personal community refs to deleted entities)
- Replace Abysslaser hitscan ref with NFRedLaserPractice in NPC misc
- Drop FuckRock/BirthdaySuit ThavenMood conflicts in yes_and / no_and

YAML Linter: 0 errors.
…a.json

PNG files were renamed during NSFW cleanup but meta.json kept the old
'meditech' state names, breaking RSI validation. Validate RSIs now passes.
chore(engine): bump RobustToolbox to v276 / .NET 10 (Phase 2A)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Update MindSystem.cs
chore(upstream): cherry-pick 3 wizden bugfixes (2026-05-06)
chore(upstream): wizden content sync 2026-05-06 (Phase 3)
chore(sanitization): debrand remaining meditech surfaces
chore(sanitization): remove remaining PassionDrobe and lewd leftovers
…eur.yaml -> .yml (#8)

- PullController.Initialize() was registering binds under PullingSystem instead
  of PullController, causing a duplicate-binds warning on every server boot.
  Upstream wizden fixed this in #36161; align VRS accordingly.
- Roboisseur.yaml had a .yaml extension which the prototype loader silently
  ignores; renamed to .yml so the DV NPC prototype is actually loaded.
Adds 162 missing locale files from wizden/master (commands, features, UI strings)
and resolves 6 duplicate-key conflicts caused by upstream reorganizing ftl paths.

New files (upstream locale files missing from VRS):
- 76x commands/ - admin, toolshed, and dev command descriptions
- ~86x feature locale files (accents, atmos, chat, changeling, guidebook, etc.)

Conflict resolutions (duplicate key fixes):
- guidebook/chemistry/healthchange.ftl: deleted (key moved to entity-effects/healthchange.ftl)
- _DV/smartfridge/smartfridge.ftl: deleted (pure subset of upstream smartfridge/smartfridge.ftl)
- commands/toolshed-commands.ftl: stripped 47 duplicated keys; kept 4 VRS-unique hscale commands
- commands/mapping-client-side-setup-command.ftl: deleted (renamed to mappingclientsidesetup-command.ftl)
- commands/eye-commands.ftl: deleted (keys renamed; C# already uses new key names)
- commands/persistence-save-command.ftl: deleted (upstream subset; existing persistence/command.ftl is complete)
- guidebook/chemistry/effects.ftl: removed 3 terms duplicated in entity-effects/effects.ftl; kept 50 chem-specific keys
- chat/highlights/highlights.ftl: deleted; upstream chat/highlights.ftl is strictly superset
- accent/scottish.ftl (new): deleted; conflicts with _DV/accent/scottish.ftl which has VRS-extended word list
- salvage/job-board.ftl (new): merged 19 unique keys into cargo/bounties.ftl; deleted source

Build: 0 errors. YAML linter: exit 0.
@fenndragon fenndragon merged commit 89aa979 into master May 19, 2026
11 of 12 checks passed
@SpaceJohn413
Copy link
Copy Markdown

i love blank prs

fenndragon pushed a commit that referenced this pull request May 19, 2026
This reverts commit 300eb55.

Revert "Pull from vx (#1854)"

This reverts commit 89aa979.

Revert "Automated Changelog Update (#1851)"

This reverts commit c8a016b.
NotLivyathan added a commit to NotLivyathan/HardLight that referenced this pull request May 19, 2026
fenndragon pushed a commit that referenced this pull request May 20, 2026
* Start Port Starlight Languages #1253

* add some missing newlines

* emergency fixes

* Continue Port Starlight Languages #1253

* additional fixes

* doing this one file at a time apparently

* guh

* Finish Port Starlight Languages #1253

* fix to make it work

* remaining necessary port + linter fix for makesentient refactor

* Port Starlight Language Fixes #1412

* Port Starlight Language Patch #1414

* Port Starlight PR #1416 & #1421

* Port Starlight Thaveyan Language + Thaven Speech Verbs PR #1440

* Port Starlight Language Tweaks #1446

* Port Starlight Silicon Language Base PR #1454

* Port Starlight Vulpkanin, Shadekin, & Vox Language Icons PR #1480

* Port Starlight PR #1512 & #1533

* Port Starlight Language Trait Tweaks #1599

* Port Starlight PR #1453, #1611, #1673, #1854, #2231, & #2291

* Port Starlight PR #1554, #1617, #2277, #2715

* Port Starlight PR #3019 & #3796

* two quick fixes

* Port Starlight Translator Refactor PR #4242

* some more fixes

* Port Starlight Animals Understand Common PR #4340

* Port Starlight PR #1509 + linter fix

* port necessary files from Starlight PR #2935 to make icons work

* minor optimization tweaks + enable chatbox icons + mouse language color

* no idea what I'm doing

* protogen tweak

* synth fix

* add language icon display toggle
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.

6 participants