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.

Sign up for GitHub

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

Jump to bottom

Increase Combat Knife Availability #640

Merged
merged 4 commits into from
Aug 2, 2024
Merged

Increase Combat Knife Availability #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9115804
Increase availibility of combat knives to security (#27224)
Ghagliiarghii Apr 23, 2024
7809b50
feat(lathe): add combat knife to the sec techfab
angelofallars Aug 1, 2024
e07ff4a
feat(jobs): make prison guards start with combat boots
angelofallars Aug 1, 2024
ca23698
feat(loadouts): add a combat knife to loadouts for diona/harpy
angelofallars Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading