add: less roles inventory, more lockers and dressers inventory (#180)

2024-03-11 02:02:48 +03:00
parent eb792d0b24
commit f6b1999443
46 changed files with 118 additions and 168 deletions
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -27,7 +27,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
@@ -135,7 +134,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -26,7 +26,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
@@ -143,7 +142,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -40,7 +40,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
@@ -157,7 +156,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -20,7 +20,7 @@
  - type: StorageFill
    contents:
      - id: Ointment
-        amount: 2
+        amount: 3
      - id: PillCanisterKelotane
      - id: PillCanisterDermaline

@@ -32,7 +32,7 @@
  - type: StorageFill
    contents:
      - id: Brutepack
-      - id: Gauze
+        amount: 3
      - id: PillCanisterIron
      - id: PillCanisterCopper

@@ -47,6 +47,7 @@
      - id: SyringeEthylredoxrazine
      - id: AntiPoisonMedipen
      - id: PillCanisterDylovene
+        amount: 2
      - id: PillCanisterCharcoal

 - type: entity
@@ -61,6 +62,7 @@
      - id: EmergencyMedipen
      - id: SyringeInaprovaline
      - id: PillCanisterDexalin
+      - id: Gauze

 - type: entity
  id: MedkitRadiationFilled
@@ -73,6 +75,7 @@
      - id: RadAutoInjector
      - id: EmergencyMedipen
      - id: PillCanisterHyronalin
+        amount: 2

 - type: entity
  id: MedkitAdvancedFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -13,6 +13,7 @@
      - id: ClothingUniformJumpskirtCapFormalDress
      - id: ClothingHandsGlovesCaptain
      - id: ClothingNeckMantleCap
+      - id: ClothingEyesGlassesSunglasses

 - type: entity
  id: DresserChiefEngineerFilled
@@ -50,6 +51,7 @@
      - id: ClothingNeckCloakHop
      - id: ClothingHeadHatHopcap
      - id: ClothingOuterWinterHoP
+      - id: ClothingHandsGlovesHop

 - type: entity
  id: DresserHeadOfSecurityFilled
@@ -67,6 +69,7 @@
      - id: ClothingUniformJumpskirtHosFormal
      - id: ClothingUniformJumpsuitHosFormal
      - id: ClothingMaskNeckGaiter
+      - id: ClothingHandsGlovesCombat

 - type: entity
  id: DresserQuarterMasterFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -90,6 +90,8 @@
      - id: MedkitOxygenFilled
      - id: HolofanProjector
      - id: DoorRemoteFirefight
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson

 - type: entity
  id: LockerAtmosphericsFilled
@@ -105,6 +107,8 @@
      - id: MedkitOxygenFilled
      - id: HolofanProjector
      - id: DoorRemoteFirefight
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson

 - type: entity
  id: LockerEngineerFilledHardsuit
@@ -119,6 +123,8 @@
      - id: OxygenTankFilled
      - id: NitrogenTankFilled
      - id: ClothingShoesBootsMag
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson

 - type: entity
  id: LockerEngineerFilled
@@ -130,6 +136,8 @@
      - id: ClothingHandsGlovesColorYellow
      - id: ClothingMaskGas
      - id: trayScanner
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson

 - type: entity
  id: ClosetRadiationSuitFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -171,6 +171,7 @@
      - id: AccessConfigurator
      - id: RCD
      - id: RCDAmmo
+      - id: ClothingHeadHatHardhatWhite

 - type: entity
  id: LockerChiefMedicalOfficerFilledHardsuit
@@ -196,6 +197,7 @@
      - id: MedicalTechFabCircuitboard
      - id: BoxEncryptionKeyMedical
      - id: Eftpos
+      - id: ClothingBeltMedical

 - type: entity
  id: LockerChiefMedicalOfficerFilled
@@ -217,6 +219,7 @@
      - id: MedicalTechFabCircuitboard
      - id: BoxEncryptionKeyMedical
      - id: Eftpos
+      - id: ClothingBeltMedical

 - type: entity
  id: LockerResearchDirectorFilledHardsuit
@@ -279,6 +282,7 @@
      - id: BoxEncryptionKeySecurity
      - id: HoloprojectorSecurity
      - id: BookSecretDocuments
+      - id: WeaponPistolMk58Nonlethal

 - type: entity
  id: LockerHeadOfSecurityFilled
@@ -304,6 +308,8 @@
      - id: BoxEncryptionKeySecurity
      - id: HoloprojectorSecurity
      - id: BookSecretDocuments
+      - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistol

 - type: entity
  id: LockerFreezerVaultFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -119,11 +119,15 @@
      - id: BoxBottle
      - id: BoxVial
      - id: ChemBag
+        amount: 3
      - id: ClothingHandsGlovesLatex
+        amount: 3
      - id: ClothingHeadsetMedical
+        amount: 3
      - id: ClothingMaskSterile
+        amount: 3
      - id: HandLabeler
-        prob: 0.5
+        amount: 3
      - id: Eftpos

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -15,12 +15,15 @@
      - id: ClothingHandsGlovesCombat
      - id: ClothingShoesBootsJack
      - id: ClothingOuterCoatWarden
+      - id: ClothingHeadHatWarden
      - id: ClothingOuterWinterWarden
      - id: RubberStampWarden
      - id: DoorRemoteArmory
      - id: ClothingOuterHardsuitWarden
      - id: HoloprojectorSecurity
      - id: BoxBodyCamera
+      - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistol

 - type: entity
  id: LockerWardenFilled
@@ -45,6 +48,8 @@
      - id: DoorRemoteArmory
      - id: HoloprojectorSecurity
      - id: BoxBodyCamera
+      - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistol

 - type: entity
  id: LockerSecurityFilled
@@ -54,7 +59,6 @@
  - type: StorageFill
    contents:
      - id: FlashlightSeclite
-        prob: 0.8
      - id: ClothingUniformJumpsuitSecGrey
        prob: 0.3
      - id: ClothingHeadHelmetBasic
@@ -72,6 +76,9 @@
      - id: HoloprojectorSecurity
        prob: 0.6
      - id: WeaponTempGun
+      - id: WeaponPistolMk58Nonlethal
+      - id: BoxBodyCamera
+      - id: MagazinePistol

 - type: entity
  id: LockerBrigmedicFilled
@@ -127,6 +134,10 @@
      - id: ClothingHandsGlovesForensic
      - id: HoloprojectorSecurity
      - id: BoxEvidenceMarkers
+      - id: ClothingBeltHolsterFilled
+      - id: BoxBodyCamera
+      - id: VoiceRecorder
+      - id: ClothingEyesGlassesSecurity

 - type: entity
  id: ClosetBombFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -111,6 +111,9 @@
      - id: ClothingHeadHatTrucker
        prob: 0.1
      - id: Eftpos
+      - id: HydroponicsToolSpade
+      - id: HydroponicsToolMiniHoe
+      - id: RobustHarvestChemistryBottle

 - type: entity
  id: LockerBotanistLoot
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -172,12 +172,19 @@
   - type: StorageFill
     contents:
       - id: ClothingHeadHatCargosoft
+         amount: 3
       - id: ClothingUniformJumpsuitCargo
+         amount: 3
       - id: ClothingBackpack
+         amount: 3
       - id: ClothingShoesColorBlack
+         amount: 3
       - id: ClothingUniformJumpskirtCargo
+         amount: 3
       - id: ClothingHandsGlovesFingerless
+         amount: 3
       - id: AppraisalTool
+         amount: 3

 - type: entity
   id: WardrobeSalvageFilled
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -15,7 +15,6 @@
 - type: startingGear
  id: CargoTechGear
  equipment:
-    head: ClothingHeadHatCargosoft
    jumpsuit: ClothingUniformJumpsuitCargo
    back: ClothingBackpackCargoFilled
    shoes: ClothingShoesColorBlack
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -42,8 +42,6 @@
    shoes: ClothingShoesColorBrown
    id: QuartermasterPDA
    ears: ClothingHeadsetQM
-    belt: BoxFolderClipboard
-    pocket1: AppraisalTool
    underwearb: ClothingUnderwearBottomBoxersQM # White-Underwear
  underweart: ClothingUnderwearTopBraQM # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesQM # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -21,9 +21,7 @@
 - type: startingGear
  id: BartenderGear
  equipment:
-    head: ClothingHeadHatTophat
    jumpsuit: ClothingUniformJumpsuitBartender
-    outerClothing: ClothingOuterVest
    back: ClothingBackpackFilled
    shoes: ClothingShoesColorBlack
    id: BartenderPDA
--- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -23,7 +23,6 @@
    id: BotanistPDA
    ears: ClothingHeadsetService
    outerClothing: ClothingOuterApronBotanist
-    belt: ClothingBeltPlantFilled
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -25,14 +25,13 @@
    jumpsuit: ClothingUniformJumpsuitChaplain
    back: ClothingBackpackChaplainFilled
    shoes: ClothingShoesColorBlack
+    belt: NullRod
    id: ChaplainPDA
    ears: ClothingHeadsetService
    pocket1: ArmamentsBeacon
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
-  inhand:
-    - NullRod
  innerClothingSkirt: ClothingUniformJumpskirtChaplain
  satchel: ClothingBackpackSatchelChaplainFilled
  duffelbag: ClothingBackpackDuffelChaplainFilled
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -22,14 +22,10 @@
  id: ChefGear
  equipment:
    jumpsuit: ClothingUniformJumpsuitChef
-    head: ClothingHeadHatChef
    back: ClothingBackpackFilled
-    mask: ClothingMaskItalianMoustache
    shoes: ClothingShoesColorBlack
    id: ChefPDA
    ears: ClothingHeadsetService
-    outerClothing: ClothingOuterApronChef
-    belt: ClothingBeltChefFilled
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -20,12 +20,9 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitJanitor
    back: ClothingBackpackFilled
-    shoes: ClothingShoesGaloshes
-    head: ClothingHeadHatPurplesoft
+    shoes: ClothingShoesColorPurple
    id: JanitorPDA
-    gloves: ClothingHandsGlovesJanitor
    ears: ClothingHeadsetService
-    belt: ClothingBeltJanitorFilled
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -18,8 +18,6 @@
    shoes: ClothingShoesBootsLaceup
    id: LibrarianPDA
    ears: ClothingHeadsetService
-    pocket1: d10Dice
-    pocket2: HandLabeler # for making named bestsellers
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -24,11 +24,9 @@
    jumpsuit: ClothingUniformJumpsuitMime
    back: ClothingBackpackMimeFilled
    head: ClothingHeadHatBeret
-    belt: ClothingBeltSuspenders
    gloves: ClothingHandsGlovesLatex
    shoes: ClothingShoesColorWhite
    pocket1: CrayonMime
-    pocket2: Paper
    mask: ClothingMaskMime
    id: MimePDA
    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -19,7 +19,6 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitMusician
    back: ClothingBackpackMusicianFilled
-    eyes: ClothingEyesGlassesSunglasses
    shoes: ClothingShoesBootsLaceup
    id: MusicianPDA
    ears: ClothingHeadsetService
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -40,10 +40,6 @@
    jumpsuit: ClothingUniformJumpsuitCaptain
    back: ClothingBackpackCaptainFilled
    shoes: ClothingShoesBootsLaceup
-    head: ClothingHeadHatCaptain
-    eyes: ClothingEyesGlassesSunglasses
-    gloves: ClothingHandsGlovesCaptain
-    outerClothing: ClothingOuterArmorCaptainCarapace
    id: CaptainPDA
    ears: ClothingHeadsetAltCommand
    underwearb: ClothingUnderwearBottomBoxersCap # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -61,11 +61,8 @@
    jumpsuit: ClothingUniformJumpsuitHoP
    back: ClothingBackpackHOPFilled
    shoes: ClothingShoesColorBrown
-    head: ClothingHeadHatHopcap
    id: HoPPDA
-    gloves: ClothingHandsGlovesHop
    ears: ClothingHeadsetAltCommand
-    belt: BoxFolderClipboard
    underwearb: ClothingUnderwearBottomBoxersHOP # White-Underwear
  underweart: ClothingUnderwearTopBraHOP # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesHOP # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -23,9 +23,7 @@
    jumpsuit: ClothingUniformJumpsuitAtmos
    back: ClothingBackpackAtmosphericsFilled
    shoes: ClothingShoesColorWhite
-    eyes: ClothingEyesGlassesMeson
    id: AtmosPDA
-    belt: ClothingBeltUtilityEngineering
    ears: ClothingHeadsetEngineering
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -38,14 +38,11 @@
 - type: startingGear
  id: ChiefEngineerGear
  equipment:
-    head: ClothingHeadHatHardhatWhite
    jumpsuit: ClothingUniformJumpsuitChiefEngineer
    back: ClothingBackpackChiefEngineerFilled
    shoes: ClothingShoesColorBrown
    id: CEPDA
-    eyes: ClothingEyesGlassesMeson
    ears: ClothingHeadsetCE
-    belt: ClothingBeltUtilityEngineering
    underwearb: ClothingUnderwearBottomBoxersCE # White-Underwear
  underweart: ClothingUnderwearTopBraCE # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesCE # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
@@ -29,15 +29,11 @@
 - type: startingGear
  id: SeniorEngineerGear
  equipment:
-    head: ClothingHeadHatBeretEngineering
    jumpsuit: ClothingUniformJumpsuitSeniorEngineer
    back: ClothingBackpackEngineeringFilled
    shoes: ClothingShoesBootsMag
    id: SeniorEngineerPDA
-    eyes: ClothingEyesGlassesMeson
-    belt: ClothingBeltUtilitySeniorEngineerFilled
    ears: ClothingHeadsetEngineering
-    gloves: ClothingHandsGlovesColorYellow
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -20,14 +20,10 @@
 - type: startingGear
  id: StationEngineerGear
  equipment:
-    head: ClothingHeadHatHardhatYellow
    jumpsuit: ClothingUniformJumpsuitEngineering
    back: ClothingBackpackEngineeringFilled
    shoes: ClothingShoesBootsWork
-    outerClothing: ClothingOuterVestHazard
    id: EngineerPDA
-    eyes: ClothingEyesGlassesMeson
-    belt: ClothingBeltUtilityEngineering
    ears: ClothingHeadsetEngineering
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -26,9 +26,8 @@
    back: ClothingBackpackEngineeringFilled
    shoes: ClothingShoesBootsWork
    id: TechnicalAssistantPDA
-    belt: ClothingBeltUtilityEngineering
    ears: ClothingHeadsetEngineering
-    pocket2: BookEngineersHandbook
+    pocket1: BookEngineersHandbook
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Justice/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Justice/lawyer.yml
@@ -26,7 +26,6 @@
    shoes: ClothingShoesBootsLaceup
    id: LawyerPDA
    ears: ClothingHeadsetSecurity
-    pocket1: BookSpaceLaws
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -21,12 +21,8 @@
    jumpsuit: ClothingUniformJumpsuitChemistry
    back: ClothingBackpackChemistryFilled
    shoes: ClothingShoesColorWhite
-    outerClothing: ClothingOuterCoatLabChem
    id: ChemistryPDA
    ears: ClothingHeadsetMedical
-    belt: ChemBag
-    pocket1: HandLabeler
-    # the purple glasses?
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -38,10 +38,8 @@
    jumpsuit: ClothingUniformJumpsuitCMO
    back: ClothingBackpackCMOFilled
    shoes: ClothingShoesColorBrown
-    outerClothing: ClothingOuterCoatLabCmo
    id: CMOPDA
    ears: ClothingHeadsetCMO
-    belt: ClothingBeltMedicalFilled
    underwearb: ClothingUnderwearBottomBoxersCMO # White-Underwear
  underweart: ClothingUnderwearTopBraCMO # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesCMO # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -22,10 +22,8 @@
    jumpsuit: ClothingUniformJumpsuitMedicalDoctor
    back: ClothingBackpackMedicalFilled
    shoes: ClothingShoesColorWhite
-    outerClothing: ClothingOuterCoatLab
    id: MedicalPDA
    ears: ClothingHeadsetMedical
-    belt: ClothingBeltMedicalFilled
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -24,8 +24,7 @@
    shoes: ClothingShoesColorWhite
    id: MedicalInternPDA
    ears: ClothingHeadsetMedical
-    belt: ClothingBeltMedicalFilled
-    pocket2: BookMedicalReferenceBook
+    pocket1: BookMedicalReferenceBook
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -26,7 +26,6 @@
    shoes: ClothingShoesColorBlue
    id: ParamedicPDA
    ears: ClothingHeadsetMedical
-    belt: ClothingBeltMedicalEMTFilled
  innerClothingSkirt: ClothingUniformJumpskirtParamedic
  satchel: ClothingBackpackSatchelParamedicFilled
  duffelbag: ClothingBackpackDuffelParamedicFilled
--- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
@@ -28,16 +28,11 @@
 - type: startingGear
  id: SeniorPhysicianGear
  equipment:
-    head: ClothingHeadHatBeretBrigmedic
    jumpsuit: ClothingUniformJumpsuitSeniorPhysician
    back: ClothingBackpackMedicalFilled
    shoes: ClothingShoesColorBlack
-    outerClothing: ClothingOuterCoatLabSeniorPhysician
    id: SeniorPhysicianPDA
    ears: ClothingHeadsetMedical
-    belt: ClothingBeltSeniorPhysicianFilled
-    mask: ClothingMaskSterile
-    gloves: ClothingHandsGlovesLatex
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -24,7 +24,7 @@
    shoes: ClothingShoesColorWhite
    id: ResearchAssistantPDA
    ears: ClothingHeadsetScience
-    pocket2: BookScientistsGuidebook
+    pocket1: BookScientistsGuidebook
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -35,7 +35,6 @@
    jumpsuit: ClothingUniformJumpsuitResearchDirector
    back: ClothingBackpackResearchDirectorFilled
    shoes: ClothingShoesColorBrown
-    outerClothing: ClothingOuterCoatRD
    id: RnDPDA
    ears: ClothingHeadsetRD
    underwearb: ClothingUnderwearBottomBoxersRD # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -20,7 +20,6 @@
    jumpsuit: ClothingUniformJumpsuitScientist
    back: ClothingBackpackScienceFilled
    shoes: ClothingShoesColorWhite
-    outerClothing: ClothingOuterCoatRnd
    id: SciencePDA
    ears: ClothingHeadsetScience
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
@@ -21,15 +21,11 @@
 - type: startingGear
  id: SeniorResearcherGear
  equipment:
-    head: ClothingHeadHatBeretRND
    jumpsuit: ClothingUniformJumpsuitSeniorResearcher
    back: ClothingBackpackScienceFilled
    shoes: ClothingShoesColorBlack
-    outerClothing: ClothingOuterCoatLabSeniorResearcher
    id: SeniorResearcherPDA
    ears: ClothingHeadsetScience
-    gloves: ClothingHandsGlovesColorYellow
-    belt: ClothingBeltUtilityFilled
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -31,12 +31,8 @@
    jumpsuit: ClothingUniformJumpsuitDetective
    back: ClothingBackpackSecurityFilledDetective
    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSecurity
-    head: ClothingHeadHatFedoraBrown
-    outerClothing: ClothingOuterVestDetective
    id: DetectivePDA
    ears: ClothingHeadsetSecurity
-    belt: ClothingBeltHolsterFilled
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -43,13 +43,8 @@
    jumpsuit: ClothingUniformJumpsuitHoS
    back: ClothingBackpackHOSFilled
    shoes: ClothingShoesBootsCombatFilled
-    outerClothing: ClothingOuterCoatHoSTrench
-    eyes: ClothingEyesGlassesSecurity
-    head: ClothingHeadHatBeretHoS
    id: HoSPDA
-    gloves: ClothingHandsGlovesCombat
    ears: ClothingHeadsetAltSecurity
-    belt: ClothingBeltSecurityFilled
    pocket1: WeaponPistolMk58Nonlethal
    underwearb: ClothingUnderwearBottomBoxersHOS # White-Underwear
  underweart: ClothingUnderwearTopBraHOS # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -30,10 +30,8 @@
    jumpsuit: ClothingUniformJumpsuitColorRed
    back: ClothingBackpackSecurityFilled
    shoes: ClothingShoesBootsCombatFilled
-    outerClothing: ClothingOuterArmorBasic
    id: SecurityCadetPDA
    ears: ClothingHeadsetSecurity
-    pocket1: WeaponPistolMk58Nonlethal
    pocket2: BookSecurity
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -29,13 +29,8 @@
    jumpsuit: ClothingUniformJumpsuitSec
    back: ClothingBackpackSecurityFilled
    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSecurity
-    head: ClothingHeadHelmetBasic
-    outerClothing: ClothingOuterArmorBasic
    id: SecurityPDA
    ears: ClothingHeadsetSecurity
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -39,14 +39,8 @@
    jumpsuit: ClothingUniformJumpsuitSeniorOfficer
    back: ClothingBackpackSecurityFilled
    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSecurity
-    head: ClothingHeadHatBeretSecurity
-    outerClothing: ClothingOuterArmorBasic
    id: SeniorOfficerPDA
    ears: ClothingHeadsetSecurity
-    belt: ClothingBeltSeniorSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-    gloves: ClothingHandsGlovesCombat
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraWhite # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -28,16 +28,11 @@
 - type: startingGear
  id: WardenGear
  equipment:
-    head: ClothingHeadHatWarden
    jumpsuit: ClothingUniformJumpsuitWarden
    back: ClothingBackpackSecurityFilled
    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSecurity
-    outerClothing: ClothingOuterCoatWarden
    id: WardenPDA
    ears: ClothingHeadsetSecurity
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -1,77 +1,20 @@
- type: department
-  id: Cargo
-  description: department-Cargo-description
-  color: "#A46106"
-  roles:
-  - CargoTechnician
-  - Quartermaster
-  - SalvageSpecialist
-
- type: department
-  id: Civilian
-  description: department-Civilian-description
-  color: "#9FED58"
-  weight: -10
-  roles:
-  - Bartender
-  - Borg
-  - Botanist
-  - Boxer
-  - Chaplain
-  - Chef
-  - Clown
-  - HeadOfPersonnel
-  - Janitor
-  - Librarian
-  - Mime
-  - Musician
-  - Passenger
-  - Reporter
-  - Visitor
-  - Zookeeper
-  - ServiceWorker
-
 - type: department
  id: Command
  description: department-Command-description
  color: "#334E6D"
  roles:
-  - Captain
  - CentralCommandOfficial
-  - ChiefEngineer
-  - ChiefMedicalOfficer
+  - Captain
  - HeadOfPersonnel
  - HeadOfSecurity
+  - ChiefEngineer
+  - ChiefMedicalOfficer
  - ResearchDirector
  - Quartermaster
  - Inspector
  primary: false
  weight: 100

- type: department
-  id: Engineering
-  description: department-Engineering-description
-  color: "#EFB341"
-  roles:
-  - AtmosphericTechnician
-  - ChiefEngineer
-  - SeniorEngineer
-  - StationEngineer
-  - TechnicalAssistant
-
- type: department
-  id: Medical
-  description: department-Medical-description
-  color: "#52B4E9"
-  roles:
-  - Chemist
-  - ChiefMedicalOfficer
-  - MedicalDoctor
-  - MedicalIntern
-  - Psychologist
-  - Paramedic
-  - SeniorPhysician
-
 - type: department
  id: Security
  description: department-Security-description
@@ -79,11 +22,68 @@
  weight: 20
  roles:
  - HeadOfSecurity
-  - SecurityCadet
-  - SecurityOfficer
-  - SeniorOfficer
-  - Detective
  - Warden
+  - SeniorOfficer
+  - SecurityOfficer
+  - Detective
+  - SecurityCadet
+
+- type: department
+  id: Cargo
+  description: department-Cargo-description
+  color: "#A46106"
+  roles:
+  - Quartermaster
+  - CargoTechnician
+  - SalvageSpecialist
+
+- type: department
+  id: Civilian
+  description: department-Civilian-description
+  color: "#9FED58"
+  weight: -10
+  roles:
+  - HeadOfPersonnel
+  - Borg
+  - Bartender
+  - Janitor
+  - Botanist
+  - Chaplain
+  - Chef
+  - Clown
+  - Mime
+  - Boxer
+  - ServiceWorker
+  - Librarian
+  - Musician
+  - Reporter
+  - Visitor
+  - Zookeeper
+  - Passenger
+
+- type: department
+  id: Engineering
+  description: department-Engineering-description
+  color: "#EFB341"
+  roles:
+  - ChiefEngineer
+  - SeniorEngineer
+  - AtmosphericTechnician
+  - StationEngineer
+  - TechnicalAssistant
+
+- type: department
+  id: Medical
+  description: department-Medical-description
+  color: "#52B4E9"
+  roles:
+  - ChiefMedicalOfficer
+  - SeniorPhysician
+  - MedicalDoctor
+  - Paramedic
+  - Chemist
+  - MedicalIntern
+  - Psychologist

 - type: department
  id: Science