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.

Sign up for GitHub

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

Jump to bottom

Cherry-Pick Improvised Weaponry; DeltaV #1217

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Cherry-Pick Improvised Weaponry; DeltaV #1217

wants to merge 8 commits into from
+767 −44

Conversation

Tmanzxd
Copy link
Contributor

@Tmanzxd Tmanzxd commented Nov 13, 2024

Description

Adds Muskets, Flintlocks, Pipebombs, Firebombs, gunpowder, and craftable ammo for flintlock weaponry from DeltaV.

TODO

  • Cherry-picked Muskets, Pipebombs, Firebombs, and Gunpowder crafting

Media

Example Media Embed

Changelog

🆑

  • add: Muskets, Flintlocks, Pipebombs, Firebombs, gunpowder, and craftable ammo for flintlock weaponry.

Tryded and others added 3 commits November 13, 2024 14:06
@Tryded @Colin-Tel @Tmanzxd
Craftable muskets + Flintlocks (Simple-Station#1008)
66f465c 
* 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 <113523727+Colin-Tel@users.noreply.github.com>
Signed-off-by: Tryded <139474617+Tryded@users.noreply.github.com>

---------

Signed-off-by: Tryded <139474617+Tryded@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
@Tryded @Tmanzxd
Fixes for craftable muskets (Simple-Station#1261)
b61653d 
* Add wielded in hand sprite for musket

* actually adding the sprites in YML

* Add a missing tag
@Dutch-VanDerLinde @Tmanzxd
Pipebombs and IED rework (#25705)
b67b032 
* 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 <comedian_vs_clown@hotmail.com>

(cherry picked from commit 3cb1c58)
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Nov 13, 2024
@SimpleStation14 SimpleStation14 changed the title Cherry pick Improvised Weaponry, DeltaV Cherry Pick Improvised Weaponry, DeltaV Nov 13, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 13, 2024 •
edited
Loading

RSI Diff Bot; head commit 4c98a00 merging into 114ecde
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Misc/bayonet.rsi

State Old New Status
base Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Misc/modular_breech.rsi

State Old New Status
base Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Misc/modular_trigger.rsi

State Old New Status
base Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Casings/musket_casing.rsi

State Old New Status
base Added

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

State Old New Status
base Added
inhand-left Added
inhand-right Added
wielded-inhand-left Added
wielded-inhand-right Added

Resources/Textures/Objects/Weapons/Bombs/pipebomb.rsi

State Old New Status
base Added
icon Added
primed Added
wires Added

Edit: diff updated after 4c98a00

@Tmanzxd
Copy link
Contributor Author

Tmanzxd commented Nov 13, 2024

Ah, Duplicate ID, my weakness

@Tmanzxd
Merge branch 'Simple-Station:master' into Cherry-pick-muskets
dd9fde1
@Tmanzxd
Fix duplicate ID
20f8168 
Signed-off-by: Tmanzxd <164098915+Tmanzxd@users.noreply.github.com>
@Tmanzxd
Copy link
Contributor Author

Tmanzxd commented Nov 13, 2024

Zinga

VMSolidus
VMSolidus approved these changes Nov 14, 2024
View reviewed changes
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fun

@github-actions github-actions bot added the Status: Needs Review Someone please review this label Nov 14, 2024
@FoxxoTrystan FoxxoTrystan added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point and removed Status: Needs Review Someone please review this labels Nov 14, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Nov 14, 2024
@Tmanzxd
Copy link
Contributor Author

Tmanzxd commented Nov 15, 2024

Spoke to a goob maintainer, they mentioned that the Mosin has the same sprite as the Musket. Are we going to want to resprite one of them?

@Tmanzxd Tmanzxd changed the title Cherry Pick Improvised Weaponry, DeltaV Cherry-pick Improvised Weaponry; DeltaV Nov 15, 2024
@SimpleStation14 SimpleStation14 changed the title Cherry-pick Improvised Weaponry; DeltaV Cherry-Pick Improvised Weaponry; DeltaV Nov 15, 2024
FoxxoTrystan
FoxxoTrystan suggested changes Nov 21, 2024
View reviewed changes
Copy link
Contributor

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were heavly recomending to move everything out of forks namespaces as we are a hardfork.

Please move it to EE/Normal Namespace whenever possible.

Resources/Prototypes/DeltaV/Entities/Objects/Misc/improvised_gun_parts.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/musket.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/musket.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/musket.rsi/inhand-left.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/musket.rsi/inhand-right.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/musket.rsi/meta.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/musket.rsi/wielded-inhand-left.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/musket.rsi/wielded-inhand-right.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to this to normal namespace.

@Tmanzxd
Copy link
Contributor Author

Tmanzxd commented Dec 3, 2024

Sorry for the hiatus, Thanksgiving Break and school stuff. Will try to get this done.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 2, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FoxxoTrystan FoxxoTrystan FoxxoTrystan requested changes

@VMSolidus VMSolidus VMSolidus approved these changes

@Aidenkrz Aidenkrz Awaiting requested review from Aidenkrz

@Remuchi Remuchi Awaiting requested review from Remuchi Remuchi is a code owner

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT DEATHB4DEFEAT is a code owner

@Peptide90 Peptide90 Awaiting requested review from Peptide90

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist

@OldDanceJacket OldDanceJacket Awaiting requested review from OldDanceJacket

@NotScoutieBoi NotScoutieBoi Awaiting requested review from NotScoutieBoi

Assignees

@Tmanzxd Tmanzxd

Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 3-Medium For medium issues/PRs Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Tmanzxd @VMSolidus @FoxxoTrystan @Tryded @Dutch-VanDerLinde