diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml index 2038ef0013..4e885a08b2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml @@ -38,7 +38,7 @@ amount: 3 - id: ClothingUniformRandomArmless amount: 5 - - id: ClothingUniformRandomStandart + - id: ClothingUniformRandomStandard amount: 5 - id: ClothingUniformRandomBra amount: 5 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml index 88278077b5..e113f0ffc7 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml @@ -10,9 +10,9 @@ - type: Sprite sprite: Clothing/Uniforms/procedural.rsi layers: - - state: base_torso_standart + - state: base_torso_standard map: [ "torso" ] - - state: base_leg_standart + - state: base_leg_standard map: [ "leg" ] - state: mask_null map: [ "decor" ] @@ -24,9 +24,9 @@ sprite: Clothing/Uniforms/procedural.rsi clothingVisuals: jumpsuit: - - state: base_torso_standart + - state: base_torso_standard map: [ "torso" ] - - state: base_leg_standart + - state: base_leg_standard map: [ "leg" ] - state: mask_null map: [ "decor" ] @@ -42,7 +42,7 @@ offset: 0 prototypes: - ClothingUniformRandomArmless - - ClothingUniformRandomStandart + - ClothingUniformRandomStandard - ClothingUniformRandomBra - ClothingUniformRandomShorts - ClothingUniformRandomShirt @@ -57,7 +57,7 @@ - torso: base_torso_armless: Sixteen leg: - base_leg_standart: Sixteen + base_leg_standard: Sixteen base_leg_short: Sixteen base_leg_skirt: Sixteen base_leg_skirt_long: Sixteen @@ -76,16 +76,16 @@ - type: entity parent: ClothingUniformRandom - id: ClothingUniformRandomStandart + id: ClothingUniformRandomStandard name: colorful costume components: - type: RandomSprite available: - torso: - base_torso_standart: Sixteen - base_torso_standart2: Sixteen + base_torso_standard: Sixteen + base_torso_standard2: Sixteen leg: - base_leg_standart: Sixteen + base_leg_standard: Sixteen base_leg_short: Sixteen base_leg_skirt: Sixteen base_leg_skirt_long: Sixteen @@ -100,15 +100,15 @@ decor_torso_armless8: Sixteen decor_torso_armless9: Sixteen decor_torso_armless10: Sixteen - decor_torso_standart1: Sixteen - decor_torso_standart2: Sixteen - decor_torso_standart3: Sixteen - decor_torso_standart4: Sixteen - decor_torso_standart5: Sixteen - decor_torso_standart6: Sixteen - decor_torso_standart7: Sixteen - decor_torso_standart8: Sixteen - decor_torso_standart9: Sixteen + decor_torso_standard1: Sixteen + decor_torso_standard2: Sixteen + decor_torso_standard3: Sixteen + decor_torso_standard4: Sixteen + decor_torso_standard5: Sixteen + decor_torso_standard6: Sixteen + decor_torso_standard7: Sixteen + decor_torso_standard8: Sixteen + decor_torso_standard9: Sixteen mask_null: "" - type: entity @@ -121,7 +121,7 @@ - torso: base_torso_bra: Sixteen leg: - base_leg_standart: Sixteen + base_leg_standard: Sixteen base_leg_short: Sixteen base_leg_skirt: Sixteen base_leg_skirt_long: Sixteen @@ -143,7 +143,7 @@ - torso: mask_null: "" leg: - base_leg_standart: Sixteen + base_leg_standard: Sixteen base_leg_short: Sixteen base_leg_skirt: Sixteen base_leg_skirt_long: Sixteen @@ -159,11 +159,11 @@ base_torso_armless: Sixteen mask_null: "" leg: - base_leg_standart: Sixteen + base_leg_standard: Sixteen base_leg_short: Sixteen decor: base_torso_shirt: Sixteen overlay: decor_torso_shirt1: Sixteen decor_torso_shirt2: Sixteen - decor_torso_shirt3: Sixteen \ No newline at end of file + decor_torso_shirt3: Sixteen diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml index 06009b4d2f..1aeef4f066 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml @@ -5,5 +5,5 @@ description: "Like a cigar, but for tough teens. (WARNING:Pour only water into the vape)" components: - type: Sprite - sprite: Objects/Consumable/Smokeables/Vapes/vape-standart.rsi - state: icon \ No newline at end of file + sprite: Objects/Consumable/Smokeables/Vapes/vape-standard.rsi + state: icon diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index fa029c035a..2caa4010ca 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -53,18 +53,6 @@ components: - type: StorageFill contents: - - id: ClothingUniformRandomArmless - prob: 0.05 - orGroup: dressermainloot - - id: ClothingUniformRandomStandart - prob: 0.05 - orGroup: dressermainloot - - id: ClothingUniformRandomBra - prob: 0.05 - orGroup: dressermainloot - - id: ClothingUniformRandomShorts - prob: 0.05 - orGroup: dressermainloot - id: ClothingNeckLGBTPin prob: 0.06 orGroup: dressermainloot diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml index 6d69010a0c..7dc43f5f33 100644 --- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml @@ -82,7 +82,7 @@ - type: latheRecipe id: Vape icon: - sprite: Objects/Consumable/Smokeables/Vapes/vape-standart.rsi + sprite: Objects/Consumable/Smokeables/Vapes/vape-standard.rsi state: icon result: Vape completetime: 2 diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standart.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standard.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standart.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standard.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standard.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standard.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standard2.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart2.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standard2.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart1.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard1.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart1.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard1.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard2.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart2.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard2.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart3.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard3.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart3.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard3.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart4.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard4.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart4.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard4.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart5.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard5.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart5.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard5.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart6.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard6.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart6.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard6.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart7.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard7.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart7.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard7.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart8.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard8.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart8.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard8.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart9.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard9.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart9.png rename to Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standard9.png diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json index 08133fc00b..545f209db9 100644 --- a/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json @@ -20,7 +20,7 @@ "directions": 4 }, { - "name": "base_leg_standart", + "name": "base_leg_standard", "directions": 4 }, { @@ -36,11 +36,11 @@ "directions": 4 }, { - "name": "base_torso_standart", + "name": "base_torso_standard", "directions": 4 }, { - "name": "base_torso_standart2", + "name": "base_torso_standard2", "directions": 4 }, { @@ -116,39 +116,39 @@ "directions": 4 }, { - "name": "decor_torso_standart1", + "name": "decor_torso_standard1", "directions": 4 }, { - "name": "decor_torso_standart2", + "name": "decor_torso_standard2", "directions": 4 }, { - "name": "decor_torso_standart3", + "name": "decor_torso_standard3", "directions": 4 }, { - "name": "decor_torso_standart4", + "name": "decor_torso_standard4", "directions": 4 }, { - "name": "decor_torso_standart5", + "name": "decor_torso_standard5", "directions": 4 }, { - "name": "decor_torso_standart6", + "name": "decor_torso_standard6", "directions": 4 }, { - "name": "decor_torso_standart7", + "name": "decor_torso_standard7", "directions": 4 }, { - "name": "decor_torso_standart8", + "name": "decor_torso_standard8", "directions": 4 }, { - "name": "decor_torso_standart9", + "name": "decor_torso_standard9", "directions": 4 }, { diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standard.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standard.rsi/icon.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standard.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standart.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Smokeables/Vapes/vape-standard.rsi/meta.json