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

Departmental defense as the Found Fathers intended #22002

Merged
merged 19 commits into from May 20, 2024

Conversation

Scrambledeggs00
Copy link
Contributor

@Scrambledeggs00 Scrambledeggs00 commented May 3, 2024

Document the changes in your pull request

Adds in the maintenance musket and two cartridges for it: welding fuel cartridges and black powder cartridges. An easy to craft weapon, it is clunky to use, needing 5 seconds while not moving to reload, inaccurate and, if using the welding fuel cartridges, has negative AP. It also creates a cool smoke cloud :]

Cartridge stats:

welding fuel cartridge:
damage = 25
AP = -30
spread = 40

black powder cartridge:
damage = 30
AP = 0
spread = 20

Why is this good for the game?

Gives people without access to actual weapons an option which is easier to craft than the other ranged makeshift options.

Testing

Crafting:
image
image

Musket in action:
https://www.youtube.com/watch?v=21SQyncZgwM

Spriting

Mob:
MaintMusketHands

Object:
MaintMusketObject

Wiki Documentation

The rifle does 5 damage in melee, takes 5 seconds of not moving to reload, and can have a bayonet attached to it. It is crafted with 1 pipe, 1 metal sheet, 1 rifle stock, and 5 package wrapping and needs a screwdriver, welder, and wrench for tools.

The welding fuel cartridge has the stats stated above. It is crafted with 1 cloth sheet and 10 units of welding fuel and needs a screwdriver for tools.

The black powder cartridge has the stats stated above. It is crafted with 1 cloth sheet and 10 units of black powder and needs a screwdriver for tools.

Changelog

🆑
rscadd: Adds in the maintenance musket, welding fuel cartridge, and black powder cartridge.
soundadd: Adds a firing and cocking sound for the musket.
imageadd: Adds sprites for the musket and cartridges.
/:cl:

@Scrambledeggs00 Scrambledeggs00 requested review from a team as code owners May 3, 2024 18:26
@Yogbot-13 Yogbot-13 added Feature This adds new content to the game Sprites This PR has spriting changes labels May 3, 2024
@MommaDragon
Copy link
Contributor

Okay, but can it get even better with improvised weapons knowledge?

@Scrambledeggs00
Copy link
Contributor Author

Okay, but can it get even better with improvised weapons knowledge?

I had originally planned on doing that, but I couldn't figure out how. Might come back to do it if I can think of how to do so.

@AMyriad
Copy link
Contributor

AMyriad commented May 3, 2024

image

@github-actions github-actions bot added the Sound This PR changes audio files label May 3, 2024
@Addust
Copy link
Contributor

Addust commented May 3, 2024

MAKE READY

(amazing)

@Mqiib
Copy link
Contributor

Mqiib commented May 3, 2024

God bless spess america

Copy link
Contributor

@Mqiib Mqiib left a comment

Choose a reason for hiding this comment

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

Basically just slightly tweaked versions of the improv shotgun, save for the in-hands which are good enough.

Copy link
Contributor

@Moltijoe Moltijoe left a comment

Choose a reason for hiding this comment

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

try looking at how other guns do attackby

code/modules/projectiles/guns/ballistic/launchers.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic/launchers.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic/launchers.dm Outdated Show resolved Hide resolved
Scrambledeggs00 and others added 3 commits May 6, 2024 08:02
Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
code/modules/projectiles/guns/ballistic/launchers.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic/launchers.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic/launchers.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic/launchers.dm Outdated Show resolved Hide resolved
code/modules/projectiles/projectile/special/rocket.dm Outdated Show resolved Hide resolved
code/datums/components/crafting/weapons.dm Outdated Show resolved Hide resolved
code/datums/components/crafting/weapons.dm Outdated Show resolved Hide resolved
code/datums/components/crafting/weapons.dm Outdated Show resolved Hide resolved
code/modules/projectiles/ammunition/caseless/rocket.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic/launchers.dm Outdated Show resolved Hide resolved
Scrambledeggs00 and others added 2 commits May 15, 2024 21:50
Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
Copy link
Contributor

@Moltijoe Moltijoe left a comment

Choose a reason for hiding this comment

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

pretty sure everything is good now

Copy link
Contributor

@ToasterBiome ToasterBiome left a comment

Choose a reason for hiding this comment

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

have at thee

@Moltijoe Moltijoe merged commit aefeb5b into yogstation13:master May 20, 2024
14 checks passed
Yogbot-13 added a commit that referenced this pull request May 20, 2024
@Scrambledeggs00 Scrambledeggs00 deleted the MaintMusket branch May 20, 2024 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This adds new content to the game Sound This PR changes audio files Sprites This PR has spriting changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants