From 2ae375a708d1d3418ab7b26e20f8da2e16bcbc75 Mon Sep 17 00:00:00 2001
From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com>
Date: Sun, 21 Jul 2024 15:48:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BD=D0=B5=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B4=D0=BD=D1=8B=D1=85=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D1=82=D0=B8=D0=BF=D0=BE=D0=B2=20=D0=BB=D0=BE=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=83=D1=82=D0=BE=D0=B2=20+=20=D0=BD=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20(#4?=
 =?UTF-8?q?73)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix some loadout prototypes and add new items

* fix
---
 .../Loadouts/Jobs/Science/common.yml          | 38 ++++++++++++
 .../Loadouts/Jobs/Security/common.yml         | 61 ++++++++++++++-----
 .../Loadouts/Miscellaneous/trinkets.yml       | 11 ++++
 .../Prototypes/Loadouts/loadout_groups.yml    | 51 ++++++++++------
 .../Prototypes/Loadouts/role_loadouts.yml     | 24 +++++---
 5 files changed, 142 insertions(+), 43 deletions(-)

diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/common.yml b/Resources/Prototypes/Loadouts/Jobs/Science/common.yml
index 1d9c2c8b82..3ec83a7dc7 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Science/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/common.yml
@@ -7,3 +7,41 @@
   id: ScienceHeadset
   equipment:
     ears: ClothingHeadsetScience
+
+# Jumpsuit
+
+- type: itemLoadout # WD
+  id: RoboticistJumpskirt
+  equipment: RoboticistJumpskirt
+- type: startingGear
+  id: RoboticistJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtRoboticist
+
+- type: itemLoadout # WD
+  id: RoboticistJumpsuit
+  equipment: RoboticistJumpsuit
+- type: startingGear
+  id: RoboticistJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitRoboticist
+
+# Outercloting
+
+- type: itemLoadout # WD
+  id: RoboticistLabCoat
+  equipment: RoboticistLabCoat
+- type: startingGear
+  id: RoboticistLabCoat
+  equipment:
+    outerClothing: ClothingOuterCoatRoboOpened
+
+# Gloves
+
+- type: itemLoadout # WD
+  id: RoboticistGloves
+  equipment: RoboticistGloves
+- type: startingGear
+  id: RoboticistGloves
+  equipment:
+    gloves: ClothingHandsGlovesRobohands
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/common.yml b/Resources/Prototypes/Loadouts/Jobs/Security/common.yml
index ac569befe4..a25c32a95b 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/common.yml
@@ -1,15 +1,6 @@
-# jumpsuit
-- type: itemLoadout
-  id: SecurityJumpsuitBlue
-  equipment: SecurityJumpsuitBlue
-- type: startingGear
-  id: SecurityJumpsuitBlue
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSecBlue
+# Ears
 
-# ears
-
-- type: itemLoadout
+- type: itemLoadout # WD
   id: SecurityHeadset
   equipment: SecurityHeadset
 - type: startingGear
@@ -17,7 +8,7 @@
   equipment:
     ears: ClothingHeadsetSecurity
 
-- type: itemLoadout
+- type: itemLoadout # WD
   id: SecurityCommandHeadset
   equipment: SecurityCommandHeadset
 - type: startingGear
@@ -25,7 +16,7 @@
   equipment:
     ears: ClothingHeadsetAltSecurityCommand
 
-- type: itemLoadout
+- type: itemLoadout # WD
   id: SecurityHeadsetFull
   equipment: SecurityHeadsetFull
 - type: startingGear
@@ -35,7 +26,7 @@
 
 # Mask
 
-- type: itemLoadout
+- type: itemLoadout # WD
   id: SecurityMaskStandard
   equipment: SecurityMaskStandard
 - type: startingGear
@@ -43,10 +34,50 @@
   equipment:
     mask: ClothingMaskGasSecurity
 
-- type: itemLoadout
+- type: itemLoadout # WD
   id: SecurityMaskSwat
   equipment: SecurityMaskSwat
 - type: startingGear
   id: SecurityMaskSwat
   equipment:
     mask: ClothingMaskGasSwat
+
+# Jumpsuit
+
+- type: itemLoadout # WD
+  id: SecurityJumpsuitBlue
+  equipment: SecurityJumpsuitBlue
+- type: startingGear
+  id: SecurityJumpsuitBlue
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSecBlue
+
+# Belt
+
+- type: itemLoadout # WD
+  id: SecurityWebbing
+  equipment: SecurityWebbing
+- type: startingGear
+  id: SecurityWebbing
+  equipment:
+    belt: ClothingBeltSecurityWebbing
+
+# Job trinkets
+
+- type: itemLoadout # WD
+  id: SecurityWhistle
+  equipment: SecurityWhistle
+- type: startingGear
+  id: SecurityWhistle
+  storage:
+    back:
+    - SecurityWhistle
+
+- type: itemLoadout # WD
+  id: SecurityFlashlight
+  equipment: SecurityFlashlight
+- type: startingGear
+  id: SecurityFlashlight
+  storage:
+    back:
+    - FlashlightSeclite
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 2c8c38b9e6..c077e95f67 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -8,6 +8,17 @@
     back:
     - PlushieLizard
 
+# Useful items
+
+- type: itemLoadout # WD
+  id: HandheldStationMap
+  equipment: HandheldStationMap
+- type: startingGear
+  id: HandheldStationMap
+  storage:
+    back:
+    - HandheldStationMap
+
 # Table games
 - type: itemLoadout # WD
   id: ChessBoard
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 975bff6227..77df53e05e 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -5,6 +5,7 @@
   minLimit: 0
   maxLimit: 3
   loadouts:
+  - HandheldStationMap # WD
   - ChessBoard # WD
   - CheckerBoard # WD
   - BackgammonBoard # WD
@@ -74,7 +75,6 @@
   name: loadout-group-outerclothing
   minLimit: 0
   loadouts:
-  - CaptainOuterClothing
   - CaptainWintercoat
 
 - type: loadoutGroup
@@ -225,7 +225,7 @@
   loadouts:
   - AssistantPDA
 
-- type: loadoutGroup # WD edot
+- type: loadoutGroup # WD edit
   id: BartenderHead
   name: loadout-group-head
   minLimit: 0
@@ -233,7 +233,7 @@
   - BowlerHat
   - Tophat
   - HatMagician
-  - BeretStandardЙ
+  - BeretStandard
   - FrenchBeret
   - FedoraGrey
 
@@ -617,7 +617,7 @@
   - BowlerHat
   - Tophat
   - HatMagician
-  - BeretStandardЙ
+  - BeretStandard
   - FrenchBeret
 
 - type: loadoutGroup
@@ -1211,7 +1211,7 @@
   loadouts:
   - BrownShoes
   - ShoesLeather
-  - ClothingShoesBootsLaceup
+  - BootsLaceup # WD
   - ScienceWinterBoots
 
 - type: loadoutGroup # WD
@@ -1238,8 +1238,8 @@
   loadouts:
   - SeniorResearcherJumpsuit
   - SeniorResearcherJumpskirt
-  - RoboticistJumpsuit
-  - RoboticistJumpskirt
+  - RoboticistJumpsuit # WD
+  - RoboticistJumpskirt # WD
 
 - type: loadoutGroup
   id: SeniorResearcherOuterclothing
@@ -1251,7 +1251,6 @@
   - ScienceLabCoat
   - ScienceWintercoat
   - RoboticistLabCoat
-  - RoboticistWintercoat
 
 - type: loadoutGroup
   id: ScientistHead
@@ -1287,14 +1286,13 @@
   - ScienceLabCoat
   - ScienceWintercoat
   - RoboticistLabCoat
-  - RoboticistWintercoat
 
 - type: loadoutGroup
   id: ScientistShoes
   name: loadout-group-shoes
   loadouts:
   - WhiteShoes
-  - BlackShoes
+  - ShoesColorBlack # WD
   - ScienceWinterBoots
 
 - type: loadoutGroup
@@ -1333,7 +1331,7 @@
   - GlovesColorBlack
   - GlovesColorPurple
   - GlovesLatex
-  - ClothingHandsGlovesRobohands
+  - RoboticistGloves
 
 - type: loadoutGroup # WD
   id: CommonScienceHeadset
@@ -1556,7 +1554,7 @@
   loadouts:
   - SecurityCadetPDA
 
-- type: loadoutGroup
+- type: loadoutGroup # WD
   id: CommonSecurityHead
   name: loadout-group-head
   minLimit: 0
@@ -1568,14 +1566,14 @@
   - CowboyBlack
   - CowboyBountyHunter
 
-- type: loadoutGroup
+- type: loadoutGroup # WD
   id: CommonSecurityMask
   name: loadout-group-mask
   minLimit: 0
   loadouts:
   - SecurityMaskStandard
 
-- type: loadoutGroup
+- type: loadoutGroup # WD
   id: CommonSecurityCommandMask
   name: loadout-group-mask
   minLimit: 0
@@ -1583,7 +1581,7 @@
   - SecurityMaskStandard
   - SecurityMaskSwat
 
-- type: loadoutGroup
+- type: loadoutGroup # WD
   id: CommonSecurityNeck
   name: loadout-group-neck
   minLimit: 0
@@ -1591,13 +1589,13 @@
   - BlackTie
   - RedTie
 
-- type: loadoutGroup
+- type: loadoutGroup # WD
   id: CommonSecurityHeadset
   name: loadout-group-ears
   loadouts:
   - SecurityHeadset
 
-- type: loadoutGroup
+- type: loadoutGroup # WD
   id: CommonSecurityCommandHeadset
   name: loadout-group-ears
   loadouts:
@@ -1609,14 +1607,21 @@
   loadouts:
   - SecurityHeadsetFull
 
-- type: loadoutGroup
+- type: loadoutGroup # WD
   id: CommonSecurityBackpack
   name: loadout-group-backpack
   loadouts:
   - SecurityBackpack
   - SecuritySatchel
   - SecurityDuffel
-  - CommonSatchelLeather # WD
+  - CommonSatchelLeather
+
+- type: loadoutGroup # WD
+  id: CommonSecurityBelt
+  name: loadout-group-belt
+  minLimit: 0
+  loadouts:
+  - SecurityWebbing
 
 - type: loadoutGroup
   id: CommonSecurityShoes
@@ -1626,6 +1631,14 @@
   - BootsJack
   - SecurityWinterBoots
 
+- type: loadoutGroup # WD
+  id: CommonSecurityJobTrinkets
+  name: loadout-group-job-trinkets
+  minLimit: 0
+  loadouts:
+  - SecurityWhistle
+  - SecurityFlashlight
+
 # Medical
 
 - type: loadoutGroup
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index e2d7aba241..df99d7f436 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -374,11 +374,12 @@
   - CommonSecurityCommandMask # WD
   - HeadofSecurityNeck
   - HeadofSecurityJumpsuit
-  - CommonSecurityBackpack
-  - HeadofSecurityOuterClothing
   - CommonGloves # WD
+  - CommonSecurityBelt # WD
+  - CommonSecurityBackpack
   - CommonSecurityShoes
   - HeadofSecurityPDA
+  - CommonSecurityJobTrinkets # WD
   - Trinkets
 
 - type: roleLoadout
@@ -391,8 +392,10 @@
   - WardenJumpsuit
   - CommonSecurityBackpack
   - CommonGloves # WD
+  - CommonSecurityBelt # WD
   - CommonSecurityShoes
   - WardenPDA
+  - CommonSecurityJobTrinkets # WD
   - Trinkets
 
 - type: roleLoadout
@@ -405,9 +408,11 @@
   - SeniorOfficerJumpsuit
   - CommonSecurityBackpack
   - SecurityOuterClothing
+  - CommonSecurityBelt # WD
   - CommonGloves # WD
   - CommonSecurityShoes
   - SeniorOfficerPDA
+  - CommonSecurityJobTrinkets # WD
   - Trinkets
 
 - type: roleLoadout
@@ -420,10 +425,11 @@
   - SecurityJumpsuit
   - CommonSecurityBackpack
   - SecurityOuterClothing
+  - CommonSecurityBelt # WD
   - CommonGloves # WD
   - CommonSecurityShoes
   - SecurityPDA
-  - SecurityBelt
+  - CommonSecurityJobTrinkets # WD
   - Trinkets
 
 - type: roleLoadout
@@ -439,6 +445,7 @@
   - DetectiveGloves
   - DetectiveShoes
   - DetectivePDA # WD
+  - CommonSecurityJobTrinkets # WD
   - Trinkets
 
 - type: roleLoadout
@@ -452,6 +459,7 @@
   - CommonGloves # WD
   - CommonSecurityShoes
   - SecurityCadetPDA
+  - CommonSecurityJobTrinkets # WD
   - Trinkets
 
 # Medical
@@ -491,12 +499,11 @@
   - CommonMedicalHeadset # WD
   - CommonMedicalMask # WD
   - MedicalDoctorJumpsuit
-  - MedicalGloves
   - MedicalBackpack
   - MedicalDoctorOuterClothing
-  - CommonMedicalShoes
-  - CommonMedicalGloves
-  - MedicalDoctorPDA
+  - CommonMedicalShoes # WD
+  - CommonMedicalGloves # WD
+  - MedicalDoctorPDA # WD
   - Trinkets
 
 - type: roleLoadout
@@ -521,10 +528,9 @@
   - ChemistEyes
   - CommonMedicalMask # WD
   - ChemistJumpsuit
-  - MedicalGloves
   - ChemistBackpack
   - ChemistOuterClothing
-  - CommonMedicalGloves
+  - CommonMedicalGloves # WD
   - ChemistShoes
   - ChemistPDA
   - Trinkets