Skip to content

Commit

Permalink
Increase Combat Knife Availability (#640)
Browse files Browse the repository at this point in the history
# 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

: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]>
  • Loading branch information
angelofallars and Ghagliiarghii committed Aug 2, 2024
1 parent 8ccbf7e commit 172e036
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
ClothingEyesHudSecurity: 2
ClothingEyesEyepatchHudSecurity: 2
ClothingBeltSecurityWebbing: 5
CombatKnife: 3
Zipties: 12
RiotShield: 2
RiotLaserShield: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@
- Sidearm
- MagazinePistol
- MagazineMagnum
- CombatKnife
components:
- Stunbaton
- FlashOnTrigger
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
- ShellTranquilizer
- CartridgeLightRifle
- CartridgeRifle
- CombatKnife
- MagazineBoxPistol
- MagazineBoxMagnum
- MagazineBoxRifle
Expand Down Expand Up @@ -706,6 +707,7 @@
runningState: icon
staticRecipes:
- ClothingEyesHudSecurity
- CombatKnife
- Flash
- Handcuffs
- Zipties
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,22 @@
items:
- ClothingBeltSecurityWebbingFilled

# Equipment
- type: loadout
id: LoadoutSecurityCombatKnife
category: Jobs
cost: 1
requirements:
- !type:CharacterSpeciesRequirement
species:
- Diona
- Harpy
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- CombatKnife

# TODO: Make this replace the secoff handgun and make it cheaper
# # Species
# - type: loadout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitPrisonGuard
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsJack
shoes: ClothingShoesBootsCombatFilled
eyes: ClothingEyesGlassesSecurity
head: ClothingHeadPrisonGuard
id: PrisonGuardPDA
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@
Steel: 300
Plastic: 300

- type: latheRecipe
id: CombatKnife
result: CombatKnife
category: Weapons
completetime: 2
materials:
Steel: 250
Plastic: 100

- type: latheRecipe
id: WeaponLaserCarbine
result: WeaponLaserCarbine
Expand Down

0 comments on commit 172e036

Please sign in to comment.