MAID AND BOMZH (#605)

* First

* Second

* oops

* translate

Content.Shared/Access/Components/IdCardConsoleComponent.cs

@@ -97,7 +97,7 @@ public sealed partial class IdCardConsoleComponent : Component
     [DataField("jobIcons")]
     public List<List<string>> JobIcons = new()
     {
-        new List<string> {"Captain", "HeadOfPersonnel", "HeadOfSecurity", "ChiefMedicalOfficer", "ChiefEngineer", "ResearchDirector", "QuarterMaster", "Inspector"},
+        new List<string> {"Captain", "HeadOfPersonnel", "HeadOfSecurity", "ChiefMedicalOfficer", "ChiefEngineer", "ResearchDirector", "QuarterMaster", "Inspector", "Maid"},
         new List<string> {"HeadOfPersonnel", "Lawyer", "Clown", "Bartender", "Reporter", "Chef", "Botanist", "ServiceWorker", "Zookeeper", "Musician", "Librarian", "Janitor", "Chaplain", "Mime",  "Boxer", "Passenger", "Visitor", "Borg", "CustomId"},
         new List<string> {"HeadOfSecurity", "Warden",  "SeniorOfficer", "SecurityOfficer", "Detective", "SecurityCadet", "Brigmedic", "Lawyer"},
         new List<string> {"ChiefMedicalOfficer", "SeniorPhysician", "Paramedic", "Chemist", "MedicalDoctor", "Virologist", "Geneticist", "MedicalIntern", "Psychologist"},

Resources/Locale/ru-RU/clothing/socks.ftl

@@ -42,6 +42,8 @@ ent-ClothingUnderwearStockingsLightPurple = чулки
     .desc = Светло-фиолетовые.
 ent-ClothingUnderwearStockingsLightYellow = чулки
     .desc = Желтые.
+ent-ClothingUnderwearStockingsLightWhite = чулки
+    .desc = Белые.
 ent-ClothingUnderwearSocksStripedKnee = носки
     .desc = Черно-белые.
 ent-ClothingUnderwearSocksStripedThigh = носки

Resources/Locale/ru-RU/job/job-description.ftl

@@ -50,3 +50,5 @@ job-description-senior-researcher = Обучайте новых ученых о
 job-description-senior-physician = Научите новых медиков основам ухода за ранеными, химии, диагностике больных и избавлению от мертвых.
 job-description-senior-officer = Научите новых офицеров основам обысков, предварительных арестов, тюремного заключения и тому, как правильно стрелять из огнестрельного оружия.
 job-description-senior-salvage-specialist = Покажите всем коллегам как профессионалы обчищают обломки и выполняют экспедиции.
+job-description-maid = Поддерживайте чистоту и порядок, параллельно приглядывая за Капитаном.
+job-description-bomzh = Доживайте свою жизнь, не в самых лучших для этого условиях.

Resources/Locale/ru-RU/job/job-names.ftl

@@ -50,6 +50,8 @@ job-name-senior-researcher = ведущий исследователь
 job-name-senior-physician = медицинский офицер
 job-name-senior-officer = ветеран СБ
 job-name-senior-salvage-specialist = охотник карго
+job-name-maid = прислуга
+job-name-bomzh = бомж
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = атмосферный техник

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

@@ -38,3 +38,7 @@ ent-ClothingUniformJumpskirtGenetics = юбка генетика
    .desc = Она изготовлена из специального волокна, которое обеспечивает особую защиту от биологической опасности. На ней нашивка с присвоением звания генетика.
 ent-ClothingUniformJumpskirtBrigmedic = юбка бригмедика
    .desc = Данная униформа выдается квалифицированному персоналу, прошедшему обучение. Никого не волнует, что тренировка заняла полдня.
+ent-ClothingUniformJumpskirtMaid = платье прислуги
+   .desc = Элегантное платье горничной. Позволяет чувствовать себя комфортно, безопасно и чисто вокруг.
+ent-ClothingUniformJumpskirtMaidMini = платье прислуги
+   .desc = Элегантное укороченное платье служанки. Создает ощущение комфорта, безопасности и чистоты вокруг вас. Этот вид расширяет горизонт в ваших глазах.

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl

@@ -61,3 +61,6 @@ ent-ClothingOuterJacketInspector = китель инспектора
 ent-ClothingOuterOverCoatInspector = шинель инспектора
     .desc = Строгая офицерская шинель инспектора. Пусть экипаж боится вас!
     .suffix = { "" }
+ent-ClothingOuterOverCoatBomzh = потрёпанная куртка
+    .desc = Куртка прошедшая через многое, время не сохранило её и оставило свои шрамы.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/shoes/boots.ftl

@@ -19,3 +19,6 @@ ent-ClothingShoesBootsLaceup = шнурованные туфли
 ent-ClothingShoesBootsInspector = сапоги инспектора
     .desc = Высокие, тяжёлые кожаные сапоги инспектора. Выглядят блестяще и мордонабивательно!
     .suffix = { "" }
+ent-ClothingShoesMaid = туфли прислуги
+    .desc = Туфли прислуги. Блестят от чистоты.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl

@@ -262,3 +262,6 @@ ent-ClothingUniformJumpsuitWhiteInspector = свободная форма инс
 ent-ClothingUniformJumpsuitWhiteInspectorFormal = cтрогая форма инспектора
     .desc = Рубашка, жилетка, штаны со стрелками и яркий красный галстук. Это комплект строгой официальной формы возможно самого ужасающего человека на станции - инспектора.
     .suffix = { "" }
+ent-ClothingUniformJumpsuitWhiteBomzh = обноски
+    .desc = Потрепанная форма человека, который прошел через многое. Вас поражают не столько дыры во всех местах, сколько ее запах.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl

@@ -133,3 +133,9 @@ ent-CluwnePDA = ПДА клувна
 ent-ResearchAssistantPDA = ПДА научного ассистента
     .desc = Почему он не фиолетовый?
     .suffix = { "" }
+ent-MaidPDA = ПДА прислуги
+    .desc = Сияет от собственной чистоты.
+    .suffix = { "" }
+ent-BomzhPDA = убитый ПДА
+    .desc = Жизнь прошла, и все что остаётся делать - это двигаться вперед.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl

@@ -139,3 +139,9 @@ ent-CluwneIDCard = ID карта клувна
 ent-ResearchAssistantIDCard = ID карта научного ассистента
     .desc = { ent-IDCardStandard.desc }
     .suffix = { "" }
+ent-MaidIDCard = ID карта прислуги
+    .desc = { ent-IDCardStandard.desc }
+    .suffix = { "" }
+ent-BomzhIDCard = грязная ID карта
+    .desc = Старая и грязная карта дожившая до нашего времени.
+    .suffix = { "" }

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

@@ -481,6 +481,7 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
 
+#WHITE START
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterTrenchCoatInspector
@@ -543,3 +544,26 @@
           Slash: 0.80
           Piercing: 0.80
           Heat: 0.90
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterOverCoatBomzh
+  name: bomzh's overcoat
+  description: The jacket has been through a lot, time has not been tolerant of it and has left its scars.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/OuterClothing/Coats/jacket.rsi
+  - type: Clothing
+    sprite: White/Clothing/OuterClothing/Coats/jacket.rsi
+  - type: StorageFill
+    contents:
+    - id: SmokingPipeFilledTobacco
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.90
+        Slash: 0.90
+        Piercing: 0.90
+        Heat: 0.75
+
+#WHITE END

Resources/Prototypes/Entities/Clothing/Shoes/specific.yml

@@ -272,3 +272,17 @@
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepSkates
+
+#WHITE START
+- type: entity
+  parent: ClothingShoesBaseButcherable
+  id: ClothingShoesMaid
+  name: maid shoes
+  description: The maid's shoes. Shiny.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Shoes/maidshoes.rsi
+  - type: Clothing
+    sprite: White/Clothing/Shoes/maidshoes.rsi
+
+#WHITE END

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -767,6 +767,8 @@
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
 
+
+#WHITE START
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtInspector
@@ -789,6 +791,30 @@
     - type: Clothing
       sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtMaid
+  name: maid's jumpskirt
+  description: Elegant maid's dress. Makes you feel comfortable, safe and clean around you.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Uniforms/Jumpskirt/maid.rsi
+  - type: Clothing
+    sprite: White/Clothing/Uniforms/Jumpskirt/maid.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtMaidMini
+  name: maid's mini jumpskirt
+  description: Elegant shortened maid's servant's dress. Makes you feel comfortable, safe and clean around you. This view expands your horizon in your eyes.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Uniforms/Jumpskirt/maidmini.rsi
+  - type: Clothing
+    sprite: White/Clothing/Uniforms/Jumpskirt/maidmini.rsi
+
+#WHITE END
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtMusician

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -1301,6 +1301,7 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
 
+#WHITE START
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitWhiteInspector
@@ -1322,3 +1323,16 @@
       sprite: Clothing/Uniforms/Jumpsuit/inspectorformal.rsi
     - type: Clothing
       sprite: Clothing/Uniforms/Jumpsuit/inspectorformal.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitWhiteBomzh
+  name: bomzh uniform
+  description: The ragged form of a man who has been through a lot. It's not so much the holes in all the places that strike you as the smell of her.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Uniforms/Jumpsuit/bomzh.rsi
+  - type: Clothing
+    sprite: White/Clothing/Uniforms/Jumpsuit/bomzh.rsi
+
+#WHITE END

Resources/Prototypes/Entities/Markers/Spawners/jobs.yml

@@ -247,7 +247,7 @@
       - state: green
       - state: lawyer
 
-# WHITE INSPECTOR
+#WHITE START
 - type: entity
   id: SpawnPointInspector
   parent: SpawnPointJobBase
@@ -260,6 +260,32 @@
       - state: green
       - state: lawyer
 
+- type: entity
+  id: SpawnPointBomzh
+  parent: SpawnPointJobBase
+  name: bomzh
+  components:
+  - type: SpawnPoint
+    job_id: Bomzh
+  - type: Sprite
+    layers:
+    - state: green
+    - state: bomzh
+
+- type: entity
+  id: SpawnPointMaid
+  parent: SpawnPointJobBase
+  name: maid
+  components:
+  - type: SpawnPoint
+    job_id: Maid
+  - type: Sprite
+    layers:
+    - state: green
+    - state: maid
+
+#WHITE END
+
 - type: entity
   id: SpawnPointJanitor
   parent: SpawnPointJobBase

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -414,7 +414,7 @@
   - type: Icon
     state: pda-lawyer
 
-#WHITE
+#WHITE START
 - type: entity
   parent: BasePDA
   id: InspectorPDA
@@ -425,6 +425,28 @@
     id: InspectorIDCard
     state: pda-inspector
 
+- type: entity
+  parent: BasePDA
+  id: BomzhPDA
+  name: bomzh PDA
+  description: Life has passed and all that's left to do is move forward.
+  components:
+  - type: Pda
+    id: BomzhIDCard
+    state: pda-bomzh
+
+- type: entity
+  parent: BasePDA
+  id: MaidPDA
+  name: maid PDA
+  description: Shining from her own purity.
+  components:
+  - type: Pda
+    id: MaidIDCard
+    state: pda-maid
+
+#WHITE END
+
 - type: entity
   parent: BasePDA
   id: JanitorPDA

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

@@ -417,7 +417,7 @@
     - type: PresetIdCard
       job: Lawyer
 
-#WHITE
+#WHITE START
 - type: entity
   parent: IDCardStandard
   id: InspectorIDCard
@@ -430,6 +430,32 @@
   - type: PresetIdCard
     job: Inspector
 
+- type: entity
+  parent: IDCardStandard
+  id: BomzhIDCard
+  name: Bomzh ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: silver
+    - state: idbomzh
+  - type: PresetIdCard
+    job: Passenger
+
+- type: entity
+  parent: IDCardStandard
+  id: MaidIDCard
+  name: Maid ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: silver
+    - state: idmaid
+  - type: PresetIdCard
+    job: Maid
+
+#WHITE END
+
 - type: entity
   parent: IDCardStandard
   id: HoPIDCard

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

@@ -0,0 +1,51 @@
+# Jumpsuit
+- type: itemLoadout # WD
+  id: BomzhJumpsuit
+  equipment: BomzhJumpsuit
+- type: startingGear
+  id: BomzhJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitWhiteBomzh
+
+# PDA
+- type: itemLoadout # WD
+  id: BomzhPDA
+  equipment: BomzhPDA
+- type: startingGear
+  id: BomzhPDA
+  equipment:
+    id: BomzhPDA
+
+# Outer clothing
+- type: itemLoadout
+  id: BomzhOverCoat
+  equipment: BomzhOverCoat
+- type: startingGear
+  id: BomzhOverCoat
+  equipment:
+    outerClothing: ClothingOuterOverCoatBomzh
+
+# Job Trinkets
+- type: itemLoadout # WD
+  id: BomzhTrashBag
+  equipment: BomzhTrashBag
+- type: startingGear
+  id: BomzhTrashBag
+  inhand:
+  - TrashBag
+
+- type: itemLoadout # WD
+  id: BomzhScalpelShiv
+  equipment: BomzhScalpelShiv
+- type: startingGear
+  id: BomzhScalpelShiv
+  equipment:
+    pocket1: ScalpelShiv
+
+- type: itemLoadout # WD
+  id: BomzhLantern
+  equipment: BomzhLantern
+- type: startingGear
+  id: BomzhLantern
+  equipment:
+    belt: Lantern

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

@@ -0,0 +1,97 @@
+# Jumpsuit
+- type: itemLoadout # WD
+  id: MaidJumpskirt
+  equipment: MaidJumpskirt
+- type: startingGear
+  id: MaidJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtMaid
+
+- type: itemLoadout # WD
+  id: MaidJumpskirtMini
+  equipment: MaidJumpskirtMini
+- type: startingGear
+  id: MaidJumpskirtMini
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtMaidMini
+
+# Back
+- type: itemLoadout # WD
+  id: MaidSatchel
+  equipment: MaidSatchel
+- type: startingGear
+  id: MaidSatchel
+  equipment:
+    back: ClothingBackpackSatchelFilled
+
+# Gloves
+- type: itemLoadout # WD
+  id: MaidGloves
+  equipment: MaidGloves
+- type: startingGear
+  id: MaidGloves
+  equipment:
+    gloves: ClothingHandsGlovesColorWhite
+
+# PDA
+- type: itemLoadout # WD
+  id: MaidPDA
+  equipment: MaidPDA
+- type: startingGear
+  id: MaidPDA
+  equipment:
+    id: MaidPDA
+
+# Ears
+- type: itemLoadout # WD
+  id: MaidEars
+  equipment: MaidEars
+- type: startingGear
+  id: MaidEars
+  equipment:
+    id: ClothingHeadsetCommand
+
+# Shoes
+- type: itemLoadout # WD
+  id: MaidShoes
+  equipment: MaidShoes
+- type: startingGear
+  id: MaidShoes
+  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
+  equipment: MaidSpray
+- type: startingGear
+  id: MaidSpray
+  storage:
+    back:
+    - SprayBottleWater
+
+- type: itemLoadout # WD
+  id: MaidSoap
+  equipment: MaidSoap
+- type: startingGear
+  id: MaidSoap
+  storage:
+    back:
+    - Soap
+
+- type: itemLoadout # WD
+  id: MaidMop
+  equipment: MaidMop
+- type: startingGear
+  id: MaidMop
+  inhand:
+  - MopItem

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -2149,6 +2149,86 @@
   loadouts:
   - InspectorBriefcaseInhand
 
+# Maid
+- type: loadoutGroup # WD
+  id: MaidGlasses
+  name: loadout-group-eyes
+  minLimit: 0
+  loadouts:
+  - MaidGlasses
+
+- type: loadoutGroup # WD
+  id: MaidJumpsuit
+  name: loadout-group-jumpsuit
+  loadouts:
+  - MaidJumpskirt
+  - MaidJumpskirtMini
+
+- type: loadoutGroup # WD
+  id: MaidBackpack
+  name: loadout-group-backpack
+  loadouts:
+  - MaidSatchel
+
+- type: loadoutGroup # WD
+  id: MaidGloves
+  name: loadout-group-gloves
+  minLimit: 0
+  loadouts:
+  - MaidGloves
+
+- type: loadoutGroup # WD
+  id: MaidShoes
+  name: loadout-group-shoes
+  loadouts:
+  - MaidShoes
+
+- type: loadoutGroup # WD
+  id: MaidPDA
+  name: loadout-group-pda
+  loadouts:
+  - MaidPDA
+
+- type: loadoutGroup # WD
+  id: MaidJobTrinkets
+  name: loadout-group-job-trinkets
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - MaidSpray
+  - MaidSoap
+  - MaidMop
+
+# Bomzh
+- type: loadoutGroup # WD
+  id: BomzhJumpsuit
+  name: loadout-group-jumpsuit
+  loadouts:
+  - BomzhJumpsuit
+
+- type: loadoutGroup # WD
+  id: BomzhPDA
+  name: loadout-group-pda
+  loadouts:
+  - BomzhPDA
+
+- type: loadoutGroup # WD
+  id: BomzhOuterclothing
+  name: loadout-group-outerclothing
+  minLimit: 0
+  loadouts:
+  - BomzhOverCoat
+
+- type: loadoutGroup # WD
+  id: BomzhJobTrinkets
+  name: loadout-group-job-trinkets
+  minLimit: 0
+  maxLimit: 3
+  loadouts:
+  - BomzhTrashBag
+  - BomzhScalpelShiv
+  - BomzhLantern
+
 # Wildcards
 - type: loadoutGroup
   id: ReporterHat

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -39,6 +39,22 @@
   - CommonUnderwearBraHOP
   - CommonUnderwearSocks
 
+- type: roleLoadout
+  id: JobMaid
+  groups:
+  - MaidGlasses # WD
+  - CommonCommandHeadset # WD
+  - MaidJumpsuit
+  - MaidGloves # WD
+  - MaidBackpack
+  - MaidShoes
+  - MaidPDA # WD
+  - SelfDefenceDevices # WD
+  - MaidJobTrinkets
+  - CommonUnderwearBottom
+  - CommonUnderwearBra
+  - CommonUnderwearSocks
+
 # Civilian
 - type: roleLoadout
   id: JobPassenger
@@ -233,6 +249,16 @@
   - CommonUnderwearBra
   - CommonUnderwearSocks
 
+- type: roleLoadout
+  id: JobBomzh
+  groups:
+  - BomzhJumpsuit
+  - BomzhPDA
+  - BomzhOuterclothing
+  - BomzhJobTrinkets
+  - CommonUnderwearBottom
+  - CommonUnderwearBra
+
 # Cargo
 - type: roleLoadout
   id: JobQuartermaster

Resources/Prototypes/Maps/box.yml

@@ -21,6 +21,7 @@
             #service
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            Maid: [ 1, 1 ]
             Bartender: [ 2, 2 ]
             Botanist: [ 3, 3 ]
             Chef: [ 2, 2 ]
@@ -28,6 +29,7 @@
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
+            Bomzh: [ 1, 1]
             #engineering
             ChiefEngineer: [ 1, 1 ]
             SeniorEngineer: [ 1, 1 ]

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

@@ -0,0 +1,35 @@
+- type: job
+  id: Bomzh
+  name: job-name-bomzh
+  description: job-description-bomzh
+  playTimeTracker: JobBomzh
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Civilian
+    time: 72000 # 20 ch
+  - !type:AgeRequirement
+    requiredAge: 60
+  - !type:GenderRequirement
+    requiredGenders:
+    - Male
+  - !type:SexRequirement
+    requiredSex:
+    - Male
+  - !type:SpeciesRequirement
+    species:
+    - Human
+  weight: 20
+  icon: "JobIconBomzh"
+  supervisors: job-supervisors-hop
+  whitelistedSpecies:
+  - Human
+  canBeAntag: true
+  accessGroups:
+  - Maintenance
+
+- type: startingGear
+  id: BomzhGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitCaptain
+    outerClothing: ClothingOuterOverCoatBomzh
+    id: BomzhPDA

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

@@ -0,0 +1,50 @@
+- type: job
+  id: Maid
+  name: job-name-maid
+  description: job-description-maid
+  playTimeTracker: JobMaid
+  requirements:
+  - !type:DepartmentTimeRequirement
+    department: Medical
+    time: 72000 # 20 ch
+  - !type:DepartmentTimeRequirement
+    department: Command
+    time: 72000 # 20 ch
+  - !type:AgeRequirement
+    requiredAge: 20
+  - !type:GenderRequirement
+    requiredGenders:
+    - Female
+  - !type:SexRequirement
+    requiredSex:
+    - Female
+  - !type:SpeciesRequirement
+    species:
+    - Human
+    - Felinid
+    - Harpy
+  weight: 20
+  icon: "JobIconMaid"
+  supervisors: job-supervisors-hop
+  whitelistedSpecies:
+  - Human
+  - Felinid
+  - Harpy
+  canBeAntag: false
+  accessGroups:
+  - Maintenance
+  - Command
+  - Service
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+
+- type: startingGear
+  id: MaidGear
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtMaid
+    back: ClothingBackpackSatchelFilled
+    socks: ClothingUnderwearStockingsLightWhite
+    shoes: ClothingShoesMaid
+    ears: ClothingHeadsetCommand
+    id: MaidPDA

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -14,6 +14,7 @@
   - ResearchDirector
   - Quartermaster
   - Inspector
+  - Maid
   primary: false
   buttonStyle: ButtonColorCommandDepartment
 
@@ -122,6 +123,7 @@
   - Visitor
   - Zookeeper
   - Passenger
+  - Bomzh
   buttonStyle: ButtonColorCivilianDepartment
 
 - type: department

Resources/Prototypes/Roles/play_time_trackers.yml

@@ -160,3 +160,9 @@
 # WHITE
 - type: playTimeTracker
   id: JobInspector
+
+- type: playTimeTracker
+  id: JobBomzh
+
+- type: playTimeTracker
+  id: JobMaid

Resources/Prototypes/StatusEffects/job.yml

@@ -369,6 +369,7 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorResearcher
 
+#WHITE START
 - type: statusIcon
   parent: JobIcon
   id: JobIconInspector
@@ -376,6 +377,22 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Inspector
 
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconBomzh
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: Bomzh
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconMaid
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: Maid
+
+#WHITE END
+
 - type: statusIcon
   parent: JobIcon
   id: JobIconVisitor

Resources/Prototypes/_White/Economy/salary.yml

@@ -44,3 +44,4 @@
     Scientist: 300
     ResearchAssistant: 200
     SeniorResearcher: 400
+    Maid: 300

Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml

@@ -205,6 +205,15 @@
   - type: Sprite
     sprite: White/Clothing/Underwear/Socks/stockings_yellow.rsi
 
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsLightWhite
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed yellow.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_white.rsi
+
 - type: entity
   parent: ClothingUnderwearSocksBase
   id: ClothingUnderwearSocksStripedKnee

Resources/Textures/Interface/Misc/job_icons.rsi/meta.json

@@ -186,6 +186,12 @@
         {
             "name": "Inspector"
         },
+	{
+            "name": "Bomzh"
+        },
+	{
+            "name": "Maid"
+        },
         {
             "name": "Visitor"
         },

Resources/Textures/Markers/jobs.rsi/meta.json

@@ -201,6 +201,12 @@
     },
     {
       "name": "zookeeper"
+    },
+    {
+      "name": "maid"
+    },
+    {
+      "name": "bomzh"
     }
   ]
 }

Resources/Textures/Objects/Devices/pda.rsi/meta.json

@@ -229,6 +229,12 @@
     {
       "name": "pda-inspector"
     },
+    {
+      "name": "pda-bomzh"
+    },
+    {
+      "name": "pda-maid"
+    },
     {
       "name": "equipped-IDCARD",
       "directions": 4

Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

@@ -220,6 +220,12 @@
     {
       "name": "idinspector"
     },
+    {
+      "name": "idbomzh"
+    },
+    {
+      "name": "idmaid"
+    },
     {
       "name": "gold-inhand-left",
       "directions": 4

Resources/Textures/White/Clothing/OuterClothing/Coats/jacket.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-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Shoes/maidshoes.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-FEET-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Underwear/Socks/stockings_white.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by omsoyk (Discord)",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-SOCKS",
+      "directions": 4
+    },
+    {
+      "name": "equipped-SOCKS-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maid.rsi/meta.json

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

Resources/Textures/White/Clothing/Uniforms/Jumpskirt/maidmini.rsi/meta.json

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

Resources/Textures/White/Clothing/Uniforms/Jumpsuit/bomzh.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-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}