From bf8fa41ecde4b23a64d8d6a41650d77b770abe0a Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 19 Jun 2023 11:36:29 +0300 Subject: [PATCH] comit (#17462) --- Resources/Maps/Dungeon/lava_brig.yml | 2 +- Resources/Maps/bagel.yml | 8 ++++---- Resources/Maps/fland.yml | 2 +- Resources/Maps/meta.yml | 2 +- .../Prototypes/Catalog/Fills/Crates/fun.yml | 2 +- .../Catalog/Fills/Crates/medical.yml | 6 +++--- .../Catalog/Fills/Lockers/service.yml | 2 +- .../Catalog/Fills/Lockers/wardrobe_colors.yml | 8 ++++---- .../Inventories/cargodrobe.yml | 2 +- .../Inventories/clothesmate.yml | 10 +++++----- .../VendingMachines/Inventories/hydrobe.yml | 2 +- .../VendingMachines/Inventories/robodrobe.yml | 2 +- .../VendingMachines/Inventories/secdrobe.yml | 2 +- .../Entities/Clothing/Head/bandanas.yml | 20 +++++++++---------- Resources/Prototypes/Roles/Antags/pirate.yml | 2 +- .../Roles/Jobs/Fun/misc_startinggear.yml | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml index cc432b3f73..765dffca65 100644 --- 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: diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 47e63f8845..5ef62dd848 100644 --- 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: diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 82ccec973f..66ebfde0bb 100644 --- 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: diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index c678a618ac..fd7d445733 100644 --- 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: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index e8eb6b0cba..36121f2a06 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index ab16064403..a386674d5c 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 19cfa5e927..7da64f2d1a 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml index 57d90a7964..0c7661452a 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml index 14b5fec215..70bee8f80e 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 2867bcfe9c..29fd3cc7bf 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml index 787ad545c3..5e1833f0b5 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml index 711b7cd879..117478d7cf 100644 --- 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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index f82efdc227..4a8e5acf57 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index daaf09e5a4..982aecd856 100644 --- 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: diff --git a/Resources/Prototypes/Roles/Antags/pirate.yml b/Resources/Prototypes/Roles/Antags/pirate.yml index e08e293f3a..e325643d3a 100644 --- 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 diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 081733e27e..ca627885c6 100644 --- 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