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 "Railgun" #1155

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Revert "Railgun" #1155

merged 1 commit into from
Apr 29, 2024

Conversation

NullWanderer
Copy link
Contributor

Reverts #718

Causes fails on master. Will need to be re-pr'd with a fix for the linter fail

This reverts commit c0de272.
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Apr 29, 2024
Copy link
Contributor

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Cartridges/railrod.rsi

State Old New Status
base Removed
icon Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Cartridges/railrod_nonlethal.rsi

State Old New Status
base Removed
icon Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Projectiles/projectiles.rsi

State Old New Status
beam_heavy_green Removed
impact_beam_heavy_green Removed
muzzle_beam_heavy_green Removed

Resources/Textures/DeltaV/Objects/Weapons/Guns/Railguns/railgun.rsi

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Railguns/railgun_ert.rsi

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

Resources/Textures/DeltaV/Objects/Weapons/Guns/Railguns/railgun_laser.rsi

State Old New Status
base Removed
icon Removed

@deltanedas deltanedas enabled auto-merge (squash) April 29, 2024 19:54
@deltanedas deltanedas merged commit 511685e into master Apr 29, 2024
14 checks passed
@NullWanderer NullWanderer deleted the revert-718-Railgun branch April 29, 2024 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants