Cherry Pick Improvised Weaponry, DeltaV #1217
Open
+767
−44
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Musket + parts * Graphs for Musket and Parts * Recipes for Musket + Sprites * Fix 1 * Fix two * Flintlock * Fixes * Fix 3.0 * null is nulled * forgor graph * fireRate isn't all lowercase.. * actually make ammo craftable * Craftable Flintlock Fix * Update improvised.yml * Update musket.yml * I gib up * Make firerate 1 shot every 8 seconds and it doesn't reset when you switch hands. * why. * Forgor * forgor * Update Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi/meta.json Co-authored-by: Colin-Tel <[email protected]> Signed-off-by: Tryded <[email protected]> --------- Signed-off-by: Tryded <[email protected]> Co-authored-by: Colin-Tel <[email protected]>
* Add wielded in hand sprite for musket * actually adding the sprites in YML * Add a missing tag
* inital * 2-9 * add crafting function, rename ied to fire bomb * add firebomb ignition * fikss * change damage values * add note * fix tests i think * ok * good * Review * warning --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 3cb1c58)
github-actions
bot
added
Changes: C#
SimpleStation14
changed the title
|
RSI Diff Bot; head commit 20f8168 merging into 74688cf Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi
Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi
Resources/Textures/DeltaV/Objects/Misc/modular_trigger.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/musket.rsi
Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi
|
|
Ah, Duplicate ID, my weakness |
Signed-off-by: Tmanzxd <[email protected]>
|
Zinga |
FoxxoTrystan
requested review from
Aidenkrz,
FoxxoTrystan,
Remuchi,
DEATHB4DEFEAT,
Peptide90,
Pspritechologist,
OldDanceJacket and
NotScoutieBoi
FoxxoTrystan
added
Size: 3-Medium
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds Muskets, Flintlocks, Pipebombs, Firebombs, gunpowder, and craftable ammo for flintlock weaponry from DeltaV.
TODO
Media
Changelog
🆑