Ресурсы и лодауты новых ролей (#617)

* Triumph, Slang and Vends

* govno

* New bomzh and maid resources

* oops

* fixed

* oops

Resources/Locale/ru-RU/locales-new/autotranslate-1.ftl

@@ -40,3 +40,5 @@ ent-ClothingHeadBandBlue = синяя бандана
    .desc = Синяя бандана, чтобы выглядеть круто.
 ent-ClothingHandsGlovesInspector = перчатки инспектора
     .desc = Длинные кожаные перчатки иснпектора со строгим дизайном. Блестяще!
+ent-ClothingEyesGlassesMaid = очки прислуги
+    .desc = Чистые и милые.

Resources/Locale/ru-RU/locales-new/autotranslate-2.ftl

@@ -34,3 +34,9 @@ ent-ClothingHeadHatBeretBrigmedic = медицинский берет
    .desc = Белый берет выглядит как кремовый пирог на голове.
 ent-ClothingHeadHatBeretMerc =  берет наемника
    .desc = Оливковый берет, на значке изображен шакал на скале.
+ent-ClothingHeadHatMobCap = шапочка горничной
+   .desc = Чепец горничной - Идеальный головной убор для знающей свое дело прислуги. Вы же не хотите, чтобы ваши волосы мешались вам при работе?
+ent-ClothingHeadHatBomzhHat = грязная шапка
+   .desc = Шапка ушедшего века. Она износилась и выглядит потрёпанной.
+ent-ClothingHeadHatBomzhCap = помойная кепка
+   .desc = Кепка незваного гостя. Не внушает доверия.

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -301,3 +301,19 @@
         - HamsterWearable
         - WhitelistChameleon
     - type: ShowSecurityIcons
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesMaid
+  name: maid's sunglasses
+  description: Maid's sunglasses. Clean and cute.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Eyes/Glasses/maidglasses.rsi
+  - type: Clothing
+    sprite: White/Clothing/Eyes/Glasses/maidglasses.rsi
+  - type: FlashImmunity
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: ShowSecurityIcons

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -1124,3 +1124,46 @@
   - type: AddAccentClothing
     accent: GnomeAccent
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBomzhHat
+  name: bomzh hat
+  description: An old century hat. It's worn out and looks unkempt.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Head/bomzhhat.rsi
+  - type: Clothing
+    sprite: White/Clothing/Head/bomzhhat.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBomzhCap
+  name: bomzh cap
+  description: Uninvited guest cap. Doesn't inspire confidence.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Head/bomzhcap.rsi
+  - type: Clothing
+    sprite: White/Clothing/Head/bomzhcap.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatMobCap
+  name: maid's mob cap
+  description: The headdress of a true servant.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Head/maidhat.rsi
+  - type: Clothing
+    sprite: White/Clothing/Head/maidhat.rsi

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -440,7 +440,7 @@
     - state: silver
     - state: idbomzh
   - type: PresetIdCard
-    job: Passenger
+    job: Bomzh
 
 - type: entity
   parent: IDCardStandard

Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml

@@ -7,6 +7,31 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitWhiteBomzh
 
+# HEAD
+- type: itemLoadout # WD
+  id: BomzhHeadCap
+  equipment: BomzhHeadCap
+- type: startingGear
+  id: BomzhHeadCap
+  equipment:
+   head: ClothingHeadHatBomzhCap
+
+- type: itemLoadout # WD
+  id: BomzhHeadHat
+  equipment: BomzhHeadHat
+- type: startingGear
+  id: BomzhHeadHat
+  equipment:
+    head: ClothingHeadHatBomzhHat
+
+- type: itemLoadout # WD
+  id: BomzhHeadHatMelon
+  equipment: BomzhHeadHatMelon
+- type: startingGear
+  id: BomzhHeadHatMelon
+  equipment:
+    head: ClothingHeadHatWatermelon
+
 # PDA
 - type: itemLoadout # WD
   id: BomzhPDA

Resources/Prototypes/Loadouts/Jobs/Command/maid.yml

@@ -15,6 +15,24 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtMaidMini
 
+# Head
+- type: itemLoadout # WD
+  id: MaidHeadMobCap
+  equipment: MaidHeadMobCap
+- type: startingGear
+  id: MaidHeadMobCap
+  equipment:
+    head: ClothingHeadHatMobCap
+
+# Eyes
+- type: itemLoadout # WD
+  id: MaidGlasses
+  equipment: MaidGlasses
+- type: startingGear
+  id: MaidGlasses
+  equipment:
+    eyes: ClothingEyesGlassesMaid
+
 # Back
 - type: itemLoadout # WD
   id: MaidSatchel
@@ -60,15 +78,6 @@
   equipment:
     shoes: ClothingShoesMaid
 
-# Glasses
-- type: itemLoadout # WD
-  id: MaidGlasses
-  equipment: MaidGlasses
-- type: startingGear
-  id: MaidGlasses
-  equipment:
-    eyes: ClothingEyesGlassesSecurity
-
 # Job Trinkets
 - type: itemLoadout # WD
   id: MaidSpray

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -2150,6 +2150,13 @@
   - InspectorBriefcaseInhand
 
 # Maid
+- type: loadoutGroup # WD
+  id: MaidSelfDefenceDevices
+  name: loadout-group-self-defence-devices
+  minLimit: 0
+  loadouts:
+  - Flash
+
 - type: loadoutGroup # WD
   id: MaidGlasses
   name: loadout-group-eyes
@@ -2157,6 +2164,13 @@
   loadouts:
   - MaidGlasses
 
+- type: loadoutGroup # WD
+  id: MaidHead
+  name: loadout-group-head
+  minLimit: 0
+  loadouts:
+  - MaidHeadMobCap
+
 - type: loadoutGroup # WD
   id: MaidJumpsuit
   name: loadout-group-jumpsuit
@@ -2206,6 +2220,15 @@
   loadouts:
   - BomzhJumpsuit
 
+- type: loadoutGroup # WD
+  id: BomzhHead
+  name: loadout-group-head
+  minLimit: 0
+  loadouts:
+  - BomzhHeadHat
+  - BomzhHeadCap
+  - BomzhHeadHatMelon
+
 - type: loadoutGroup # WD
   id: BomzhPDA
   name: loadout-group-pda

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -44,12 +44,13 @@
   groups:
   - MaidGlasses # WD
   - CommonCommandHeadset # WD
+  - MaidHead
   - MaidJumpsuit
   - MaidGloves # WD
   - MaidBackpack
   - MaidShoes
   - MaidPDA # WD
-  - SelfDefenceDevices # WD
+  - MaidSelfDefenceDevices # WD
   - MaidJobTrinkets
   - CommonUnderwearBottom
   - CommonUnderwearBra
@@ -254,6 +255,7 @@
   groups:
   - BomzhJumpsuit
   - BomzhPDA
+  - BomzhHead
   - BomzhOuterclothing
   - BomzhJobTrinkets
   - CommonUnderwearBottom

Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml

@@ -24,7 +24,7 @@
   whitelistedSpecies:
   - Human
   canBeAntag: true
-  accessGroups:
+  access:
   - Maintenance
 
 - type: startingGear

Resources/Textures/White/Clothing/Eyes/Glasses/maidglasses.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Maid by omsoyk Discord",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Head/bomzhcap.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Head/bomzhhat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Head/maidhat.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}