From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Mon, 7 Jul 2025 22:07:44 +0000 (-0400)
Subject: Merge branch 'master' into moss-seniorcargo
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=da6eafde619d85c6c7379fc69cc13d24f8c7f9be;p=space-station-14.git

Merge branch 'master' into moss-seniorcargo
---

da6eafde619d85c6c7379fc69cc13d24f8c7f9be
diff --cc Resources/Prototypes/Entities/Clothing/Head/hats.yml
index b984d58974,ec7801802b..b864735ff9
--- a/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/Recipes/Lathes/clothing.yml
index a39ac99607,c5f81153e2..62795bf948
--- a/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