Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Weapons from Delta-V" #2692

Merged
merged 1 commit into from
Jan 12, 2025
Merged

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Jan 12, 2025

Have to fix name space and remerge under right ones.

DeltaV to _DV

Copy link
Contributor

RSI Diff Bot; head commit 432a044 merging into 753bad3
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi

State Old New Status
base Removed
bolt-open Removed
equipped-BELT Removed
icon Removed
inhand-left Removed
inhand-right Removed
mag-0 Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi

State Old New Status
base Removed
bolt-open Removed
equipped-BELT Removed
equipped-SUITSTORAGE Removed
icon Removed
inhand-left Removed
inhand-right Removed
mag-0 Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi

State Old New Status
bolt-open Removed
equipped-BELT Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi

State Old New Status
bolt-open Removed
equipped-BELT Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi

State Old New Status
bolt-open Removed
equipped-BELT Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/ceremonial_grand.rsi

State Old New Status
base Removed
equipped-BACKPACK Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi

State Old New Status
base Removed
bolt-open Removed
equipped-BACKPACK Removed
icon Removed
inhand-left Removed
inhand-right Removed
mag-0 Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi

State Old New Status
base Removed
bolt-open Removed
equipped-BACKPACK Removed
icon Removed
inhand-left Removed
inhand-right Removed
mag-0 Removed

@GreaseMonk GreaseMonk merged commit 1fac436 into master Jan 12, 2025
14 checks passed
@GreaseMonk GreaseMonk deleted the revert-2527-Delta-V_weapons branch January 12, 2025 13:33
dvir001 added a commit that referenced this pull request Jan 12, 2025
@dvir001 dvir001 mentioned this pull request Jan 12, 2025
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.

2 participants