MAID AND BOMZH (#605)

* First

* Second

* oops

* translate

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

@@ -447,3 +447,27 @@
     sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
+
+#WHITE START
+- 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

@@ -269,3 +269,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,3 +767,62 @@
       - state: equipped-INNERCLOTHING-jumpskirt
       - state: equipped-INNERCLOTHING-shirt
         color: "#b30000"
+
+
+#WHITE START
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtInspector
+  name: inspector's informal jumpskirt
+  description: Informal inspector's outfit. Relax, everyone already knows what you wear under your thin shirt and skirt...
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/inspector.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirt/inspector.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtInspectorFormal
+  name: inspector's informal jumpskirt
+  description: Shirt, vest, short skirt and a bright red tie. This is a set of strict elegant official uniform of possibly the most terrifying person on the station - the inspector. The main thing is that you can't see the stockings under the skirt...
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi
+    - 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
+  name: musician's skirt
+  description: A fancy skirt for the musically inclined.  Perfect for any lounge act!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/musician.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/musician.rsi

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

@@ -1302,3 +1302,18 @@
     sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
+
+#WHITE START
+
+- 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

@@ -246,6 +246,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

@@ -446,6 +446,29 @@
       - CrimeAssistCartridge
       - SecWatchCartridge
 
+#WHITE START
+- 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

@@ -511,6 +511,33 @@
         color: "#CB0000"
       - state: lawyer
 
+#WHITE START
+- 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/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

@@ -35,6 +35,7 @@
   - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
   - Prisoner # Nyanotrasen - Prisoner, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
   - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
+  - Bomzh
 
 - type: department
   id: Command
@@ -49,6 +50,7 @@
   - HeadOfSecurity
   - ResearchDirector
   - Quartermaster
+  - Maid
   primary: false
   weight: 100
 

Resources/Prototypes/Roles/play_time_trackers.yml

@@ -165,3 +165,10 @@
 
 - type: playTimeTracker
   id: JobZookeeper
+
+# WHITE
+- type: playTimeTracker
+  id: JobBomzh
+
+- type: playTimeTracker
+  id: JobMaid

Resources/Prototypes/StatusEffects/job.yml

@@ -369,6 +369,23 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorResearcher
 
+#WHITE START
+- 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/Textures/Interface/Misc/job_icons.rsi/meta.json

@@ -179,6 +179,12 @@
         },
         {
             "name": "Syndicate"
+        },
+	    {
+            "name": "Bomzh"
+        },
+	    {
+            "name": "Maid"
         },
         {
             "name": "Visitor"

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

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