Skip to content

Imports updated vehicles & mechs#26

Merged
kyres1 merged 23 commits intomasterfrom
jb-import-vehicles-and-mechs
Oct 4, 2025
Merged

Imports updated vehicles & mechs#26
kyres1 merged 23 commits intomasterfrom
jb-import-vehicles-and-mechs

Conversation

@kyres1
Copy link

@kyres1 kyres1 commented Sep 28, 2025

Ports updated vehicles from an open wizden PR. Yippee.

@github-actions
Copy link

github-actions bot commented Sep 28, 2025

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

Resources/Textures/Objects/Vehicles/janicart.rsi

State Old New Status
vehicle Modified
vehicle-moving Added

Resources/Textures/Objects/Vehicles/wheelchair.rsi

State Old New Status
wheelchair_overlay Added

Edit: diff updated after 816abe3

jb1361 added 2 commits October 3, 2025 18:57
# Conflicts:
#	Content.Client/Buckle/BuckleSystem.cs
#	Content.Shared/Movement/Systems/SharedMoverController.cs
@kyres1 kyres1 merged commit 65643a2 into master Oct 4, 2025
10 of 13 checks passed
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