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

New Guns and Mosin Rework and Sawn PKA fix #1143

Closed
wants to merge 32 commits into from

Conversation

VividPups
Copy link
Contributor

@VividPups VividPups commented Mar 22, 2024

About the PR

adds the SVT40
add the Valentine
add the Space Cleaner grenade
add the M34 'Willie Pete' grenade (Kes request)
add chicken nugget recipe
Rework the Mosin to allow Melee now

Why / Balance

Well, there aren't a lot of End shift Legal weapons, this PR adds a point between The Mosin and the AK with the new SVT40 rifle also added another pistol to be put inside the loot pool for gunships (SVT could be in T3)
As of now, I have added them to the less lethal Vending machine, and Liberation. Until the Loot spawn.yml is approve in the Research Bunker PR

Technical details

Also, Clean up some of the Files for Texures and Weapons to be in there Respective parts

Media

image
image
image
image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

again just some File cleaning in the Weapons area

Changelog

  • tweak: New sharpened Bayonets had outfitted the Mosins now
  • add: SVT40 and Valentine
  • add: Space Cleaner Grenade and M34 Willie Pete Grenade
  • add: Chicken nuggets now have a cooking recipe.

Copy link
Contributor

github-actions bot commented Mar 22, 2024

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

Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi

State Old New Status
base Added
mag-1 Added
practice Added
red Added
rubber Added
uranium Added

Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi

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

Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi

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

Resources/Textures/_NF/Objects/Weapons/M34.rsi

State Old New Status
icon Added
primed Added

Edit: diff updated after bb192da

@VividPups
Copy link
Contributor Author

Yes, I know about the File with the Revolver ( I will fix it) and Spawner file (I will learn how to remove it)

@VividPups
Copy link
Contributor Author

Im not sure what the problem is with the Sprites. They are just fine in-game for me

@VividPups
Copy link
Contributor Author

Fix, the One for the gun, im going to need another set of eyes for this other error I'm getting, because I'm not seeing why it is saying that

@VividPups VividPups changed the title New Guns and Mosin Rework New Guns and Mosin Rework and Sawn PKA fix Mar 23, 2024
Copy link
Contributor

@TsjipTsjip TsjipTsjip left a comment

Choose a reason for hiding this comment

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

Most item descriptions have language mistakes in them. I've gone through and suggested changes for all of those which were directly apparent.

Your CL could be shortened into four entries, one for the mosin, one for the two new guns ("New guns: The SVT140 and Valentine pistol"), one for the two new grenades (see before) and one for the nugget recipe. I'd also reword this last one to not be roleplay-style: "Chicken nuggets now have a cooking recipe."

Lastly, and end-of-comment marker (-->) has snuck in below your CL entries.

@GreaseMonk GreaseMonk added the Status: Awaiting Changes This PR has changes that need to be made before merging label Mar 24, 2024
@VividPups
Copy link
Contributor Author

@TsjipTsjip @GreaseMonk , I think I made all the changes.

@GreaseMonk
Copy link
Contributor

GreaseMonk commented Mar 24, 2024

It makes no sense to add guns and then also add a cooking recipe, in the same PR, so split them up please, you could even make 3, so people can decide to add guns and food, but not the grenade.

Got some more points of concern here:

  • Please don't add napalm grenades to the gun vend that you can mass buy
  • Where did you get sprites from? If i can personally insert my opinion here, Im not super fond of the sprites and i cant put my finger on it to tell you what it is but its different
  • "Kesco and Sam's Weaponary Emporium" i think i read that KesCo is a company ingame, and there are posters referring to people, but there is a ship rule as well that you cant put your name on everything. Not my decision though
  • Remove # For you Slips, theyre bad comments

Please please make sure the guns are balanced, so it is ready for people to test and its not immediately overkill

@VividPups
Copy link
Contributor Author

It makes no sense to add guns and then also add a cooking recipe, in the same PR, so split them up please, you could even make 3, so people can decide to add guns and food, but not the grenade.

Got some more points of concern here:

  • Please don't add napalm grenades to the gun vend that you can mass buy
  • Where did you get sprites from? If i can personally insert my opinion here, Im not super fond of the sprites and i cant put my finger on it to tell you what it is but its different
  • "Kesco and Sam's Weaponary Emporium" i think i read that KesCo is a company ingame, and there are posters referring to people, but there is a ship rule as well that you cant put your name on everything. Not my decision though
  • Remove # For you Slips, theyre bad comments

Please please make sure the guns are balanced, so it is ready for people to test and its not immediately overkill

-If I would to split up them in others PR I can 100% guarantee that something on my visual studios will break and it will take even more time to fix. I don't recall Dirv talking to me about the PR at all.

  • where do you want the napalm grenades than, I originally wanted it in a Loot spawner. It's almost been months and a half now since a Maintainer message me about it.

  • Sam's weaponry emporium is the full name of the company. (Same how Kesco, has her name on it)

  • the napalm and space cleaner has the same Form of the Tear gas grenade.

I Tested the weapons to what I thought was fair. I suggest everytime I add a weapon or a event for the maintainers to test it

@GrandKadoer
Copy link

"No NFSD won't get warcrime grenades" but then they're in a vendor? These are class 3 contraband, and should probably be on expeds.

Copy link
Contributor

@TsjipTsjip TsjipTsjip left a comment

Choose a reason for hiding this comment

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

Some other minor things on the updated version. Nearly good tho.

@dvir001
Copy link
Contributor

dvir001 commented Mar 25, 2024

space-wizards/space-station-14#25444

Omit cleaner.

@dvir001
Copy link
Contributor

dvir001 commented Mar 25, 2024

Also your mosins made my build crash none stop when trying to use them now. (Build mod, not debug)

@VividPups
Copy link
Contributor Author

Also your mosins made my build crash none stop when trying to use them now. (Build mod, not debug)

you know more Info then it crashes would help, Espically since I don't have "Build" and the Video is showing us to use Release

@GreaseMonk
Copy link
Contributor

Also your mosins made my build crash none stop when trying to use them now. (Build mod, not debug)

you know more Info then it crashes would help, Espically since I don't have "Build" and the Video is showing us to use Release

It crashes when a mosin is handed out of a vending machine on frontier i think

@VividPups
Copy link
Contributor Author

Also your mosins made my build crash none stop when trying to use them now. (Build mod, not debug)

you know more Info then it crashes would help, Espically since I don't have "Build" and the Video is showing us to use Release

It crashes when a mosin is handed out of a vending machine on frontier i think

I tested it on both vending machines that has it and spawn new ones. In and it isn't crashing or showing any errors for me. I put screen shots on the development chat

@VividPups
Copy link
Contributor Author

VividPups commented Mar 29, 2024

I'm going to re-PR this at a later date. I however will not close until the new on is up. I will be putting the Mosin by itself, the SVT and Valentine together, and the Grenades In a different on. This will happen, After My Bluespace event is merge

@VividPups VividPups closed this May 6, 2024
@VividPups VividPups deleted the Gun branch May 9, 2024 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
No C# Sprites Status: Awaiting Changes This PR has changes that need to be made before merging Status: Need Discussion YML
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants