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

Increase Combat Knife Availability #640

Conversation

angelofallars
Copy link
Contributor

@angelofallars angelofallars commented Aug 1, 2024

Description

Added combat knives to the SecTech vendor and added the combat knife to the security techfab for a cost of 2.5 steel and 1 plastic.

With this change, Harpy and Diona Security players can now get a combat knife from the SecTech as they cannot spawn nor wear combat boots, which contains a combat knife.

Prison guards now start with combat boots with a combat knife, and a combat knife has been added to Loadouts for Felinid/Harpy security.

Cherry-picked from Space Wizards (space-wizards/space-station-14#27224).

An equivalent to "Fix no combat knives in sec techfab" (space-wizards/space-station-14#28086) has been added with 7809b50, which also adds the combat knife to emagged autolathes.

Changelog

🆑 Skubman, Ghagliiarghii

  • add: Added the combat knife to the SecTech, and the ability to manufacture combat knives in the SecLathe and emagged autolathes.
  • add: Added a 1-point combat knife to Loadouts for Felinid/Harpy security jobs.
  • tweak: Made the security belt and security webbing able to hold combat knives.
  • tweak: Prison Guards now start with combat boots with a combat knife.

Ghagliiarghii and others added 2 commits August 2, 2024 06:56
* Increase availibility of combat knives to security

* whitelisted combatknife in secbelt for Diona

* Revert SecDrobe change for MGS
@github-actions github-actions bot added the Changes: YML Changes any yml files label Aug 1, 2024
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.

Not going to also add combat knives to Security Loadouts for Harpies & Diona?

@angelofallars
Copy link
Contributor Author

Not going to also add combat knives to Security Loadouts for Harpies & Diona?

Good idea, I will add that in the same PR

@angelofallars
Copy link
Contributor Author

Not going to also add combat knives to Security Loadouts for Harpies & Diona?

Done ca23698

@DangerRevolution DangerRevolution merged commit 172e036 into Simple-Station:master Aug 2, 2024
13 checks passed
SimpleStation14 added a commit that referenced this pull request Aug 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants