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

Added Vendables to Staff Officer Closet #6496

Conversation

hislittlecuzingames
Copy link
Contributor

@hislittlecuzingames hislittlecuzingames commented Jun 17, 2024

About the pull request

Adds the bayonet to the Staff Officer locker as a separate free item.

Adds Welding Visor, wrench, blowtorch, crowbar, shovel as paid items.
5, 1, 5, 1, 1 points respectively

Explain why it's good for the game

Officers can't "just get" a bayonet, unless they use their boot knife.
It makes deploying overly cumbersome, or you just lose your boot knife and can't remove shrapnel if you deploy.

SO are also an all specialization leadership role, so allowing them to just help stuff really helps.
They can take engineering kits, but don't get useful tools.

An SO will likely want a wrench to disassemble window frames for movement or mats.
I also added crowbar incase they want to mess with folding cases or open doors.
Shovel to let them close tunnels.

Doesn't permit every tool, just the "most useful" ones.
If an SO wants to Com Tech, he'll have to take that tool belt for specialized tools like screwdrivers, and wirecutters.
But general support like a welder to fix cades makes sense to me.

Just lets SO take random one off tools if they want it.
Permits general "fill help" so to speak.

Testing Photographs and Procedure

unknown_ingamereplay_2024.06.17-13.50_clip_1.mp4

image

image

Changelog

🆑
add: Multiple tools, and welding visor to SO Locker
qol: Adds free bayonet to Staff Officer Locker
/:cl:

@github-actions github-actions bot added Feature Feature coder badge Quality of Life Make the game harder to play labels Jun 17, 2024
@hislittlecuzingames hislittlecuzingames marked this pull request as ready for review June 17, 2024 18:04
@hislittlecuzingames hislittlecuzingames marked this pull request as draft June 17, 2024 21:37
@hislittlecuzingames hislittlecuzingames changed the title Bayonet Added to Staff Officer Closet DRAFT Added Vendables to Staff Officer Closet Jun 17, 2024
@deathrobotpunch
Copy link
Contributor

could you add the flash to the normal SO vendor because they have the required skill to use one

@hislittlecuzingames
Copy link
Contributor Author

could you add the flash to the normal SO vendor because they have the required skill to use one

Rail flashlight?

The handheld one is included.
I imagine every SO would buy the magnet harness.

I am also going to to add the welding visor to go with the med visor.

I never spend like any of my points as SO.

@deathrobotpunch
Copy link
Contributor

could you add the flash to the normal SO vendor because they have the required skill to use one

Rail flashlight?

I meant the flash that the MP's and command roles like the CMO and CE get

@hislittlecuzingames
Copy link
Contributor Author

could you add the flash to the normal SO vendor because they have the required skill to use one

Rail flashlight?

I meant the flash that the MP's and command roles like the CMO and CE get

Flashbang to stun marines?

If so, then how will Mutiny ever occur?

@hislittlecuzingames hislittlecuzingames marked this pull request as ready for review June 20, 2024 15:56
@hislittlecuzingames hislittlecuzingames changed the title DRAFT Added Vendables to Staff Officer Closet Added Vendables to Staff Officer Closet Jun 20, 2024
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 28, 2024
@harryob harryob added this pull request to the merge queue Jul 3, 2024
@harryob harryob removed this pull request from the merge queue due to a manual request Jul 3, 2024
@Drulikar Drulikar added this pull request to the merge queue Jul 9, 2024
Merged via the queue into cmss13-devs:master with commit 1f82bf9 Jul 9, 2024
32 checks passed
cm13-github added a commit that referenced this pull request Jul 9, 2024
SpypigDev added a commit to SpypigDev/ComTweak that referenced this pull request Jul 15, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jul 18, 2024
# About the pull request

Fixes infinitely vendible knives bug, introduced in #6496

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: SO Armory vendors no longer infinitely supply knives
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Quality of Life Make the game harder to play Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants