comit (#17462)

2023-06-19 11:36:29 +03:00
parent f9f8bb2f1c
commit bf8fa41ecd
16 changed files with 37 additions and 37 deletions
--- a/Resources/Maps/Dungeon/lava_brig.yml
+++ b/Resources/Maps/Dungeon/lava_brig.yml
@@ -9158,7 +9158,7 @@ entities:
    - pos: 22.608034,10.659381
      parent: 588
      type: Transform
- proto: HatBandRed
+- proto: ClothingHeadBandRed
  entities:
  - uid: 1295
    components:
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -112014,7 +112014,7 @@ entities:
    - pos: 22.5,-0.5
      parent: 60
      type: Transform
- proto: HatBandGold
+- proto: ClothingHeadBandGold
  entities:
  - uid: 952
    components:
@@ -112026,7 +112026,7 @@ entities:
    - pos: -56.55667,-23.491457
      parent: 60
      type: Transform
- proto: HatBandMerc
+- proto: ClothingHeadBandMerc
  entities:
  - uid: 17463
    components:
@@ -112037,7 +112037,7 @@ entities:
    - canCollide: False
      type: Physics
    - type: InsideEntityStorage
- proto: HatBandRed
+- proto: ClothingHeadBandRed
  entities:
  - uid: 1405
    components:
@@ -112054,7 +112054,7 @@ entities:
    - pos: 31.491577,14.711699
      parent: 60
      type: Transform
- proto: HatBandSkull
+- proto: ClothingHeadBandSkull
  entities:
  - uid: 4377
    components:
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -188739,7 +188739,7 @@ entities:
    - pos: 37.581806,-4.4282417
      parent: 13329
      type: Transform
- proto: HatBandRed
+- proto: ClothingHeadBandRed
  entities:
  - uid: 34062
    components:
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -136150,7 +136150,7 @@ entities:
    - pos: 29.558147,-58.540123
      parent: 5350
      type: Transform
- proto: HatBandGold
+- proto: ClothingHeadBandGold
  entities:
  - uid: 24777
    components:
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -237,7 +237,7 @@
      - id: ClothingOuterCoatPirate
      - id: ClothingShoesBootsLaceup
        amount: 2
-      - id: HatBandRed
+      - id: ClothingHeadBandRed
      - id: FoamCutlass
        amount: 2

--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -51,9 +51,9 @@
      - id: UniformScrubsColorGreen
      - id: UniformScrubsColorPurple
      - id: UniformScrubsColorBlue
-      - id: HatBandBlue
-      - id: HatBandRed
-      - id: HatBandGreen
+      - id: ClothingHeadBandBlue
+      - id: ClothingHeadBandRed
+      - id: ClothingHeadBandGreen
      - id: ClothingMaskSterile
        amount: 3

--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -94,7 +94,7 @@
        amount: 2
      - id: ClothingOuterApronBotanist
        amount: 2
-      - id: HatBandBotany
+      - id: ClothingHeadBandBotany
        amount: 2
      - id: HydroponicsToolClippers
      - id: ClothingBeltPlant
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
@@ -86,7 +86,7 @@
      - id: ClothingUniformJumpskirtColorYellow
      - id: ClothingShoesColorOrange
        amount: 2
-      - id: HatBandGold
+      - id: ClothingHeadBandGold


 - type: entity
@@ -137,8 +137,8 @@
      - id: ClothingUniformJumpskirtColorBlack
      - id: ClothingShoesColorBlack
        amount: 2
-      - id: HatBandBlack
-      - id: HatBandSkull
+      - id: ClothingHeadBandBlack
+      - id: ClothingHeadBandSkull
        prob: 0.4

 - type: entity
@@ -152,4 +152,4 @@
      - id: ClothingUniformJumpskirtColorGreen
      - id: ClothingShoesColorBlack
        amount: 2
-      - id: HatBandGreen
+      - id: ClothingHeadBandGreen
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -6,7 +6,7 @@
    ClothingShoesColorBlack: 3
    ClothingHandsGlovesFingerless: 3
    ClothingHeadHatCargosoft: 3
-    HatBandBrown: 3
+    ClothingHeadBandBrown: 3
    ClothingHeadsetCargo: 3
    ClothingOuterWinterCargo: 2
    ClothingOuterWinterMiner: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -5,11 +5,11 @@
    ClothingBackpackDuffel: 5
    ClothingBackpackSatchel: 3
    ClothingBackpackSatchelLeather: 2
-    HatBandBlack: 2
-    HatBandBlue: 2
-    HatBandGreen: 2
-    HatBandRed: 2
-    HatBandSkull: 2
+    ClothingHeadBandBlack: 2
+    ClothingHeadBandBlue: 2
+    ClothingHeadBandGreen: 2
+    ClothingHeadBandRed: 2
+    ClothingHeadBandSkull: 2
    ClothingUniformJumpsuitColorGrey: 8
    ClothingUniformJumpskirtColorGrey: 8
    ClothingUniformJumpsuitColorWhite: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -8,6 +8,6 @@
    ClothingUniformOveralls: 3
    ClothingUniformJumpsuitHydroponics: 3
    ClothingUniformJumpskirtHydroponics: 3
-    HatBandBotany: 3
+    ClothingHeadBandBotany: 3
    ClothingHeadsetService: 2
    ClothingOuterWinterHydro: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
@@ -7,6 +7,6 @@
    ClothingShoesColorBlack: 2
    ClothingHandsGlovesFingerless: 2
    ClothingHeadHatCorpsoft: 2
-    HatBandSkull: 2
+    ClothingHeadBandSkull: 2
    ClothingHeadsetRobotics: 2
    ClothingOuterWinterRobo: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -8,7 +8,7 @@
    ClothingShoesBootsJack: 3
    ClothingHeadHatBeret: 3
    ClothingHeadHatSecsoft: 3
-    HatBandRed: 3
+    ClothingHeadBandRed: 3
    ClothingHandsGlovesColorBlack: 3
    ClothingUniformJumpskirtSec: 3
    ClothingUniformJumpsuitSecGrey: 3
--- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -1,6 +1,6 @@
 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandBlack
+  id: ClothingHeadBandBlack
  name: black bandana
  description: A black bandana to make you look cool.
  components:
@@ -11,7 +11,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandBlue
+  id: ClothingHeadBandBlue
  name: blue bandana
  description: A blue bandana to make you look cool.
  components:
@@ -22,7 +22,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandBotany
+  id: ClothingHeadBandBotany
  name: botany bandana
  description: A botany bandana to make you look cool, made from natural fibers.
  components:
@@ -33,7 +33,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandGold
+  id: ClothingHeadBandGold
  name: gold bandana
  description: A gold bandana to make you look cool.
  components:
@@ -44,7 +44,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandGreen
+  id: ClothingHeadBandGreen
  name: green bandana
  description: A green bandana to make you look cool.
  components:
@@ -55,7 +55,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandGrey
+  id: ClothingHeadBandGrey
  name: grey bandana
  description: A grey bandana to make you look cool.
  components:
@@ -66,7 +66,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandRed
+  id: ClothingHeadBandRed
  name: red bandana
  description: A red bandana to make you look cool.
  components:
@@ -77,7 +77,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandSkull
+  id: ClothingHeadBandSkull
  name: skull bandana
  description: A bandana with a skull to make you look even cooler.
  components:
@@ -88,7 +88,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandMerc
+  id: ClothingHeadBandMerc
  name: mercenary bandana
  description: To protect the head from the sun, insects and other dangers of the higher path.
  components:
@@ -99,7 +99,7 @@

 - type: entity
  parent: ClothingHeadBaseButcherable
-  id: HatBandBrown
+  id: ClothingHeadBandBrown
  name: brown bandana
  description: A brown bandana to make you look cool.
  components:
--- a/Resources/Prototypes/Roles/Antags/pirate.yml
+++ b/Resources/Prototypes/Roles/Antags/pirate.yml
@@ -3,7 +3,7 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitPirate
    back: ClothingBackpackPirateFilled
-    head: HatBandBlack
+    head: ClothingHeadBandBlack
    shoes: ClothingShoesBootsLaceup
    id: PassengerPDA
    belt: ClothingBeltUtility
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -6,7 +6,7 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitColorBlack
    back: ClothingBackpackFilled
-    head: HatBandSkull
+    head: ClothingHeadBandSkull
    eyes: ClothingEyesGlassesSunglasses
    outerClothing: ClothingOuterCoatGentle
    gloves: ClothingHandsGlovesFingerless