Outpost emergency hotfix #640
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: VMSolidus <[email protected]>
DebugOk
pushed a commit
to DebugOk/Delta-v
that referenced
this pull request
Jan 20, 2024
* Update events.yml * Update events.yml --------- Signed-off-by: VMSolidus <[email protected]> (cherry picked from commit 6d29704)
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# 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 7809b504cc1c2f8f4e9db2e820d94f292e787115, which also adds the combat knife to emagged autolathes. # Changelog :cl: 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. --------- Co-authored-by: Ghagliiarghii <[email protected]>
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Why / Balance
Technical details
Media
Breaking changes
Changelog