Merge branch 'master' into moss-seniorcargo

diff --cc Resources/Prototypes/Entities/Clothing/Head/hats.yml
index b984d5897474b0c0469e3788770ba28a41a5b981,ec7801802b5e85c242fee235f5572f6cef9951db..b864735ff9ce278199d05d51afa2579edeabc0a4
--- 1/Resources/Prototypes/Entities/Clothing/Head/hats.yml
--- 2/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@@ -1360,20 -1360,3 +1360,21 @@@
        path: /Audio/Items/flashlight_on.ogg
      soundDeactivate:
        path: /Audio/Items/flashlight_off.ogg
 +
 +- type: entity
 +  parent: ClothingHeadBase
 +  id: ClothingHeadHatBeretHop
 +  name: head of personnel's beret
 +  description: A dark blue beret with a ruby inserted in the center, for true connoisseurs of bureaucracy!
 +  components:
 +  - type: Sprite
 +    sprite: Clothing/Head/Hats/beret_hop.rsi
 +  - type: Clothing
 +    sprite: Clothing/Head/Hats/beret_hop.rsi
 +  - type: Tag
 +    tags:
 +    - HamsterWearable
 +    - ClothMade
 +    - Recyclable
 +    - WhitelistChameleon
++    

diff --cc Resources/Prototypes/Entities/Objects/Devices/pda.yml
Simple merge

diff --cc Resources/Prototypes/Loadouts/loadout_groups.yml
Simple merge

diff --cc Resources/Prototypes/Recipes/Lathes/clothing.yml
index a39ac99607624dea20e06c55b3e4140672f91fa3,c5f81153e2600749dcaa14f0f759ba5a9367061c..62795bf9488aedce60cadd59bec3f3243a57114b
--- 1/Resources/Prototypes/Recipes/Lathes/clothing.yml
--- 2/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@@ -812,11 -812,6 +812,13 @@@
  
  - type: latheRecipe
    parent: BaseCommandHatRecipe
++
 +  id: ClothingHeadHatBeretHop
 +  result: ClothingHeadHatBeretHop
 +
 +- type: latheRecipe
 +  parent: BaseCommandHatRecipe
++
    id: ClothingHeadHatQMsoft
    result: ClothingHeadHatQMsoft