From 911580421159b3a66f63be65cfa7883b6554d109 Mon Sep 17 00:00:00 2001
From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Date: Tue, 23 Apr 2024 07:24:58 -0400
Subject: [PATCH 1/4] Increase availibility of combat knives to security
 (#27224)

* Increase availibility of combat knives to security

* whitelisted combatknife in secbelt for Diona

* Revert SecDrobe change for MGS
---
 .../Catalog/VendingMachines/Inventories/sec.yml          | 1 +
 Resources/Prototypes/Entities/Clothing/Belt/belts.yml    | 1 +
 Resources/Prototypes/Recipes/Lathes/security.yml         | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
index c071305b77c..7ea927e9b62 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -14,6 +14,7 @@
     ClothingEyesHudSecurity: 2
     ClothingEyesEyepatchHudSecurity: 2
     ClothingBeltSecurityWebbing: 5
+    CombatKnife: 3
     Zipties: 12
     RiotShield: 2
     RiotLaserShield: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index d90945a7eba..359165cfc50 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -472,6 +472,7 @@
         - Sidearm
         - MagazinePistol
         - MagazineMagnum
+        - CombatKnife
       components:
         - Stunbaton
         - FlashOnTrigger
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index ffa74d460f9..08e11e4ff82 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -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

From 7809b504cc1c2f8f4e9db2e820d94f292e787115 Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Fri, 2 Aug 2024 07:02:50 +0800
Subject: [PATCH 2/4] feat(lathe): add combat knife to the sec techfab

---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 2f4ecae7645..5d727207fe6 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -169,6 +169,7 @@
        - ShellTranquilizer
        - CartridgeLightRifle
        - CartridgeRifle
+       - CombatKnife
        - MagazineBoxPistol
        - MagazineBoxMagnum
        - MagazineBoxRifle
@@ -706,6 +707,7 @@
     runningState: icon
     staticRecipes:
       - ClothingEyesHudSecurity
+      - CombatKnife
       - Flash
       - Handcuffs
       - Zipties

From e07ff4a6f02fdc430aa5393fc841a8b365162b7b Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Fri, 2 Aug 2024 07:51:54 +0800
Subject: [PATCH 3/4] feat(jobs): make prison guards start with combat boots

---
 .../Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
index 12c859b7d8c..fec6ac685ed 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
@@ -30,7 +30,7 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitPrisonGuard
     back: ClothingBackpackSecurityFilled
-    shoes: ClothingShoesBootsJack
+    shoes: ClothingShoesBootsCombatFilled
     eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadPrisonGuard
     id: PrisonGuardPDA

From ca23698b03ffe33f3bcfb00045dacb7df8e4d1ea Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Fri, 2 Aug 2024 07:53:35 +0800
Subject: [PATCH 4/4] feat(loadouts): add a combat knife to loadouts for
 diona/harpy

---
 Resources/Prototypes/Loadouts/Jobs/security.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
index c6a78ad5d22..f1c64730378 100644
--- a/Resources/Prototypes/Loadouts/Jobs/security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -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